Code

release 0.6.3#519

Code

Merged

estebanlm merged 29 commits intomasterpharo-vcs/iceberg:masterfrom dev-0.6pharo-vcs/iceberg:dev-0.6Copy head branch name to clipboardNov 21, 2017

+703-165

Commits

Commits on Oct 26, 2017

• closes #496

  estebanlm

  committed
  5b71157

  Copy full SHA for 5b71157

Commits on Oct 27, 2017

• close #497

  estebanlm

  committed
  b172337

  Copy full SHA for b172337

Commits on Nov 4, 2017

• The version of Tonel should be fixed, if it is not the pharo bootstrap is unstable and unrepetible

  tesonep

  committed
  8b52d69

  Copy full SHA for 8b52d69

• Merge pull request #500 from tesonep/fixing-version-of-tonel-for-releases

  Show description for 4e0614e
  estebanlm

  authored
  4e0614e

  Copy full SHA for 4e0614e

Commits on Nov 5, 2017

• Merge with 4e0614e

  estebanlm

  committed
  c1f465e

  Copy full SHA for c1f465e

Commits on Nov 9, 2017

• first approach (branch then commit) working.

  Show description for 4b2e620
  estebanlm

  committed
  4b2e620

  Copy full SHA for 4b2e620

• IceMergeWorkingCopyCommand working.

  Show description for 8b32e04
  estebanlm

  committed
  8b32e04

  Copy full SHA for 8b32e04

Commits on Nov 10, 2017

• Merge pull request #506 from pharo-vcs/verify-sync-before-commiting

  Show description for f7a6652
  estebanlm

  authored
  f7a6652

  Copy full SHA for f7a6652

• closes #507

  estebanlm

  committed
  fc9c3e0

  Copy full SHA for fc9c3e0

• Move reference commit to head if no other commit between saved package commit and head commit changes a package

  noha

  committed
  7b3c9f8

  Copy full SHA for 7b3c9f8

• Merge pull request #509 from noha/dev-0.6

  Show description for 8664112
  estebanlm

  authored
  8664112

  Copy full SHA for 8664112

Commits on Nov 11, 2017

• Trying to do more in order to detect the best version. If there are more versions in the image we can still try to find the most actual one by looking at the anchestry. If the anchestry chain is co…

  Show description for 0d76da1
  noha

  committed
  0d76da1

  Copy full SHA for 0d76da1

• Add packages comments to Iceberg.

  Show description for c2e725f
  jecisc

  committed
  c2e725f

  Copy full SHA for c2e725f

Commits on Nov 12, 2017

• Merge pull request #512 from jecisc/cf_comment_iceberg_packages

  Show description for bce4d93
  estebanlm

  authored
  bce4d93

  Copy full SHA for bce4d93

• After we sorted the anchestry we need to take the first element instead of anyOne

  noha

  committed
  b12ae9b

  Copy full SHA for b12ae9b

• Merge pull request #514 from noha/dev-0.6

  Show description for ff4e177
  estebanlm

  authored
  ff4e177

  Copy full SHA for ff4e177

• trying to get the right commit for versions when executing load/pull operations

  estebanlm

  committed
  70031e0

  Copy full SHA for 70031e0

Commits on Nov 13, 2017

• move validatePullRequest to IceRepository.

  Show description for 2f54595
  estebanlm

  committed
  2f54595

  Copy full SHA for 2f54595

Commits on Nov 15, 2017

• validate push can be done before actually trying it.

  Show description for ab5b968
  estebanlm

  committed
  ab5b968

  Copy full SHA for ab5b968

• typo

  estebanlm

  committed
  4a72de3

  Copy full SHA for 4a72de3

• checkout the merged tree (otherwise is not in working copy and it will be marked for deletion)

  Show description for eac70f9
  estebanlm

  committed
  eac70f9

  Copy full SHA for eac70f9

Commits on Nov 16, 2017

• handling conflicts when merge.

  Show description for 6524fb6
  estebanlm

  committed
  6524fb6

  Copy full SHA for 6524fb6

• catching merge abort exception

  estebanlm

  committed
  0a13f9f

  Copy full SHA for 0a13f9f

• ensure we handle conflict error when checking out

  estebanlm

  committed
  00d5caa

  Copy full SHA for 00d5caa

Commits on Nov 17, 2017

• validating push before pushing and before commit+push actions.

  Show description for 823d9c5
  estebanlm

  committed
  823d9c5

  Copy full SHA for 823d9c5

• add todo

  estebanlm

  committed
  aecad04

  Copy full SHA for aecad04

• remove bad send to #name

  estebanlm

  committed
  0346f44

  Copy full SHA for 0346f44

Commits on Nov 20, 2017

• remove TODO.

  Show description for 816d487
  estebanlm

  committed
  816d487

  Copy full SHA for 816d487

Commits on Nov 21, 2017

• update to tonel 1.0.4

  estebanlm

  committed
  1c6754c

  Copy full SHA for 1c6754c