Mercurial > evolve
changeset 583:95089805c3fc
merge stable into default
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Sun, 14 Oct 2012 16:23:25 +0200 |
| parents | f6063ef211fd (current diff) 8e1ca984dd78 (diff) |
| children | 8945a62f9096 |
| files | |
| diffstat | 1 files changed, 30 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-stabilize-conflict.t Wed Oct 10 15:26:09 2012 +0200 +++ b/tests/test-stabilize-conflict.t Sun Oct 14 16:23:25 2012 +0200 @@ -19,6 +19,10 @@ > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH + $ safesed() { + > sed "$1" "$2" > `pwd`/sed.temp + > mv `pwd`/sed.temp "$2" + > } create a simple repo @@ -57,7 +61,7 @@ $ hg gdown 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [1] babar count up to ten - $ sed -i'' 's/huit/height/' babar + $ safesed 's/huit/eight/' babar $ hg diff diff -r 9d5daf8bd956 babar --- a/babar Thu Jan 01 00:00:00 1970 +0000 @@ -67,7 +71,7 @@ six sept -huit - +height + +eight neuf dix $ hg amend @@ -78,13 +82,13 @@ merging babar $ hg resolve -l $ hg log -G - @ changeset: 5:fd62611d0178 + @ changeset: 5:800217d738cd | tag: tip | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: babar count up to fifteen | - o changeset: 4:83066dedff55 + o changeset: 4:6bd654225435 | parent: 0:29ec1554cfaf | user: test | date: Thu Jan 01 00:00:00 1970 +0000 @@ -103,14 +107,14 @@ $ hg gdown 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [4] babar count up to ten - $ sed -i'' 's/dix/ten/' babar + $ safesed 's/dix/ten/' babar $ hg diff - diff -r 83066dedff55 babar + diff -r 6bd654225435 babar --- a/babar Thu Jan 01 00:00:00 1970 +0000 +++ b/babar * (glob) @@ -7,4 +7,4 @@ sept - height + eight neuf -dix +ten @@ -129,19 +133,19 @@ $ hg resolve -l U babar $ hg log -G - @ changeset: 7:cc96f75eae0b + @ changeset: 7:3e191dd96e18 | tag: tip | parent: 0:29ec1554cfaf | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: babar count up to ten | - | @ changeset: 5:fd62611d0178 + | @ changeset: 5:800217d738cd | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 | | summary: babar count up to fifteen | | - | x changeset: 4:83066dedff55 + | x changeset: 4:6bd654225435 |/ parent: 0:29ec1554cfaf | user: test | date: Thu Jan 01 00:00:00 1970 +0000 @@ -156,19 +160,19 @@ $ hg revert -r 5 --all reverting babar - $ sed -i'' 's/dix/ten/' babar + $ safesed 's/dix/ten/' babar $ hg resolve --all -m $ hg evolve --continue grafting revision 5 $ hg resolve -l $ hg log -G - @ changeset: 8:ce7ee8fecf30 + @ changeset: 8:92429cce7036 | tag: tip | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: babar count up to fifteen | - o changeset: 7:cc96f75eae0b + o changeset: 7:3e191dd96e18 | parent: 0:29ec1554cfaf | user: test | date: Thu Jan 01 00:00:00 1970 +0000 @@ -182,26 +186,28 @@ proper behavior with conflict using an external merge tools ----------------------------------------------------------- - $ sed -i'' 's/merge=.*/merge=touch/' $HGRCPATH - $ sed -i'' 's/touch.gui=.*/touch.gui=false/' $HGRCPATH + $ safesed 's/merge=.*/merge=touch/' $HGRCPATH + $ safesed 's/touch.gui=.*/touch.gui=false/' $HGRCPATH $ hg gdown 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [7] babar count up to ten - $ sed -i'' 's/ten/zehn/' babar + $ safesed 's/ten/zehn/' babar $ hg diff - diff -r cc96f75eae0b babar + diff -r 3e191dd96e18 babar --- a/babar Thu Jan 01 00:00:00 1970 +0000 +++ b/babar * (glob) @@ -7,4 +7,4 @@ sept - height + eight neuf -ten +zehn $ hg amend 1 new unstable changesets - $ sed -i'' 's/interactive=.*/interactive=true/' $HGRCPATH - $ yes n 2> ../shutup | HGMERGE=touch hg evolve + $ safesed 's/interactive=.*/interactive=true/' $HGRCPATH + $ HGMERGE=touch hg evolve <<EOF + > n + > EOF move:[8] babar count up to fifteen atop:[10] babar count up to ten merging babar @@ -214,19 +220,19 @@ $ hg resolve -l U babar $ hg log -G - @ changeset: 10:02c637e61375 + @ changeset: 10:a7fe09efd4a1 | tag: tip | parent: 0:29ec1554cfaf | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: babar count up to ten | - | @ changeset: 8:ce7ee8fecf30 + | @ changeset: 8:92429cce7036 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 | | summary: babar count up to fifteen | | - | x changeset: 7:cc96f75eae0b + | x changeset: 7:3e191dd96e18 |/ parent: 0:29ec1554cfaf | user: test | date: Thu Jan 01 00:00:00 1970 +0000 @@ -245,6 +251,6 @@ cinq six sept - height + eight neuf zehn