D8140: shelve: fix ordering of merge labels
Closed by commit rHG69b091cdc506: shelve: fix ordering of merge labels (authored by spectral). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8140?vs=20273=20275 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8140/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8140 AFFECTED FILES mercurial/shelve.py tests/test-shelve.t tests/test-shelve2.t CHANGE DETAILS diff --git a/tests/test-shelve2.t b/tests/test-shelve2.t --- a/tests/test-shelve2.t +++ b/tests/test-shelve2.t @@ -253,11 +253,11 @@ M f ? f.orig $ cat f - <<< shelve: d44eae5c3d33 - shelve: pending changes temporary commit + <<< working-copy: d44eae5c3d33 - shelve: pending changes temporary commit g === f - >>> working-copy: aef214a5229c - shelve: changes to: commit stuff + >>> shelve: aef214a5229c - shelve: changes to: commit stuff $ cat f.orig g $ hg unshelve --abort -t false @@ -295,11 +295,11 @@ M f ? f.orig $ cat f - <<< shelve: 6b563750f973 - test: intermediate other change + <<< working-copy: 6b563750f973 - test: intermediate other change g === f - >>> working-copy: aef214a5229c - shelve: changes to: commit stuff + >>> shelve: aef214a5229c - shelve: changes to: commit stuff $ cat f.orig g @@ -937,9 +937,9 @@ [1] $ cat foo r0 - <<< shelve: 0b2fcf2a90e9 - shelve: pending changes temporary commit + <<< working-copy: 0b2fcf2a90e9 - shelve: pending changes temporary commit this is in wdir, conflicts with shelve === this will be shelved - >>> working-copy: 9c072a2163db - shelve: changes to: r0 + >>> shelve: 9c072a2163db - shelve: changes to: r0 $ cd .. diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -408,11 +408,11 @@ +++ b/a/a @@ -1,2 +1,6 @@ a - +<<< shelve: 2377350b6337 - shelve: pending changes temporary commit + +<<< working-copy: 2377350b6337 - shelve: pending changes temporary commit c +=== +a - +>>> working-copy: a68ec3400638 - shelve: changes to: [mq]: second.patch + +>>> shelve: a68ec3400638 - shelve: changes to: [mq]: second.patch diff --git a/b/b b/b.rename/b rename from b/b rename to b.rename/b diff --git a/mercurial/shelve.py b/mercurial/shelve.py --- a/mercurial/shelve.py +++ b/mercurial/shelve.py @@ -997,7 +997,7 @@ repo, shelvectx, shelvectx.p1(), -labels=[b'shelve', b'working-copy'], +labels=[b'working-copy', b'shelve'], keepconflictparent=True, ) if stats.unresolvedcount: To: spectral, #hg-reviewers, marmoute, pulkit Cc: marmoute, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D8140: shelve: fix ordering of merge labels
spectral updated this revision to Diff 20273. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8140?vs=20264=20273 BRANCH stable CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8140/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8140 AFFECTED FILES mercurial/shelve.py tests/test-shelve.t tests/test-shelve2.t CHANGE DETAILS diff --git a/tests/test-shelve2.t b/tests/test-shelve2.t --- a/tests/test-shelve2.t +++ b/tests/test-shelve2.t @@ -253,11 +253,11 @@ M f ? f.orig $ cat f - <<< shelve: d44eae5c3d33 - shelve: pending changes temporary commit + <<< working-copy: d44eae5c3d33 - shelve: pending changes temporary commit g === f - >>> working-copy: aef214a5229c - shelve: changes to: commit stuff + >>> shelve: aef214a5229c - shelve: changes to: commit stuff $ cat f.orig g $ hg unshelve --abort -t false @@ -295,11 +295,11 @@ M f ? f.orig $ cat f - <<< shelve: 6b563750f973 - test: intermediate other change + <<< working-copy: 6b563750f973 - test: intermediate other change g === f - >>> working-copy: aef214a5229c - shelve: changes to: commit stuff + >>> shelve: aef214a5229c - shelve: changes to: commit stuff $ cat f.orig g @@ -937,9 +937,9 @@ [1] $ cat foo r0 - <<< shelve: 0b2fcf2a90e9 - shelve: pending changes temporary commit + <<< working-copy: 0b2fcf2a90e9 - shelve: pending changes temporary commit this is in wdir, conflicts with shelve === this will be shelved - >>> working-copy: 9c072a2163db - shelve: changes to: r0 + >>> shelve: 9c072a2163db - shelve: changes to: r0 $ cd .. diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -408,11 +408,11 @@ +++ b/a/a @@ -1,2 +1,6 @@ a - +<<< shelve: 2377350b6337 - shelve: pending changes temporary commit + +<<< working-copy: 2377350b6337 - shelve: pending changes temporary commit c +=== +a - +>>> working-copy: a68ec3400638 - shelve: changes to: [mq]: second.patch + +>>> shelve: a68ec3400638 - shelve: changes to: [mq]: second.patch diff --git a/b/b b/b.rename/b rename from b/b rename to b.rename/b diff --git a/mercurial/shelve.py b/mercurial/shelve.py --- a/mercurial/shelve.py +++ b/mercurial/shelve.py @@ -997,7 +997,7 @@ repo, shelvectx, shelvectx.p1(), -labels=[b'shelve', b'working-copy'], +labels=[b'working-copy', b'shelve'], keepconflictparent=True, ) if stats.unresolvedcount: To: spectral, #hg-reviewers, marmoute, pulkit Cc: marmoute, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D8140: shelve: fix ordering of merge labels
marmoute added a comment. marmoute accepted this revision. Looks good. Thansk for the fix. I assume this should go on stable? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8140/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8140 To: spectral, #hg-reviewers, marmoute Cc: marmoute, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D8140: shelve: fix ordering of merge labels
spectral created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8140 AFFECTED FILES mercurial/shelve.py tests/test-shelve.t tests/test-shelve2.t CHANGE DETAILS diff --git a/tests/test-shelve2.t b/tests/test-shelve2.t --- a/tests/test-shelve2.t +++ b/tests/test-shelve2.t @@ -253,11 +253,11 @@ M f ? f.orig $ cat f - <<< shelve: d44eae5c3d33 - shelve: pending changes temporary commit + <<< working-copy: d44eae5c3d33 - shelve: pending changes temporary commit g === f - >>> working-copy: aef214a5229c - shelve: changes to: commit stuff + >>> shelve: aef214a5229c - shelve: changes to: commit stuff $ cat f.orig g $ hg unshelve --abort -t false @@ -295,11 +295,11 @@ M f ? f.orig $ cat f - <<< shelve: 6b563750f973 - test: intermediate other change + <<< working-copy: 6b563750f973 - test: intermediate other change g === f - >>> working-copy: aef214a5229c - shelve: changes to: commit stuff + >>> shelve: aef214a5229c - shelve: changes to: commit stuff $ cat f.orig g @@ -937,9 +937,9 @@ [1] $ cat foo r0 - <<< shelve: 0b2fcf2a90e9 - shelve: pending changes temporary commit + <<< working-copy: 0b2fcf2a90e9 - shelve: pending changes temporary commit this is in wdir, conflicts with shelve === this will be shelved - >>> working-copy: 9c072a2163db - shelve: changes to: r0 + >>> shelve: 9c072a2163db - shelve: changes to: r0 $ cd .. diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -419,11 +419,11 @@ +++ b/a/a @@ -1,2 +1,6 @@ a - +<<< shelve: 2377350b6337 - shelve: pending changes temporary commit + +<<< working-copy: 2377350b6337 - shelve: pending changes temporary commit c +=== +a - +>>> working-copy: 203c9f771d2b - shelve: changes to: [mq]: second.patch + +>>> shelve: 203c9f771d2b - shelve: changes to: [mq]: second.patch diff --git a/b/b b/b.rename/b rename from b/b rename to b.rename/b diff --git a/mercurial/shelve.py b/mercurial/shelve.py --- a/mercurial/shelve.py +++ b/mercurial/shelve.py @@ -996,7 +996,7 @@ stats = merge.graft( repo, shelvectx, -labels=[b'shelve', b'working-copy'], +labels=[b'working-copy', b'shelve'], keepconflictparent=True, ) if stats.unresolvedcount: To: spectral, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
