This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5367

tests: add a missing "cd .." to test-rebase-inmemory.t
ClosedPublic

Authored by martinvonz on Dec 4 2018, 12:02 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG9b1d5eea07f9: tests: add a missing "cd .." to test-rebase-inmemory.t

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Dec 4 2018, 12:02 PM
Closed by commit rHG9b1d5eea07f9: tests: add a missing "cd .." to test-rebase-inmemory.t (authored by martinvonz). · Explain WhyDec 4 2018, 5:20 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-rebase-inmemory.t (7 lines)

Diff 12697

tests/test-rebase-inmemory.t

o 1: 02952614a83d 'd' o 1: 02952614a83d 'd'
| |
@ 0: b173517d0057 'a' @ 0: b173517d0057 'a'
$ hg cat -r 3 b $ hg cat -r 3 b
b (no-eol) b (no-eol)
$ hg cat -r 2 c $ hg cat -r 2 c
c (no-eol) c (no-eol)
$ cd ..
Case 2: Case 2:
$ hg init repo2 $ hg init repo2
$ cd repo2 $ cd repo2
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> c b > c b
> |/ > |/
> d > d
| o 2: 09c044d2cb43 'd' | o 2: 09c044d2cb43 'd'
| | | |
| o 1: fc055c3b4d33 'b' | o 1: fc055c3b4d33 'b'
|/ |/
o 0: b173517d0057 'a' o 0: b173517d0057 'a'
$ hg rebase -r . -d 2 $ hg rebase -r . -d 2
rebasing 4:daf7dfc139cb "a/a" (tip) rebasing 4:daf7dfc139cb "a/a" (tip)
saved backup bundle to $TESTTMP/repo1/repo2/.hg/strip-backup/daf7dfc139cb-fdbfcf4f-rebase.hg saved backup bundle to $TESTTMP/repo2/.hg/strip-backup/daf7dfc139cb-fdbfcf4f-rebase.hg
$ hg tglog $ hg tglog
@ 4: c6ad37a4f250 'a/a' @ 4: c6ad37a4f250 'a/a'
| |
| o 3: 844a7de3e617 'c' | o 3: 844a7de3e617 'c'
| | | |
o | 2: 09c044d2cb43 'd' o | 2: 09c044d2cb43 'd'
| | | |
o | 2: 09c044d2cb43 'd' o | 2: 09c044d2cb43 'd'
| | | |
o | 1: fc055c3b4d33 'b' o | 1: fc055c3b4d33 'b'
|/ |/
o 0: b173517d0057 'a' o 0: b173517d0057 'a'
$ hg rebase -r . -d 5 $ hg rebase -r . -d 5
rebasing 7:855e9797387e "added a back!" (tip) rebasing 7:855e9797387e "added a back!" (tip)
saved backup bundle to $TESTTMP/repo1/repo2/.hg/strip-backup/855e9797387e-81ee4c5d-rebase.hg saved backup bundle to $TESTTMP/repo2/.hg/strip-backup/855e9797387e-81ee4c5d-rebase.hg
$ hg tglog $ hg tglog
@ 7: bb3f02be2688 'added a back!' @ 7: bb3f02be2688 'added a back!'
| |
| o 6: d14530e5e3e6 'added bar' | o 6: d14530e5e3e6 'added bar'
| | | |
o | 5: 9b94b9373deb 'added foo' o | 5: 9b94b9373deb 'added foo'
|/ |/
rebasing 2:177f92b77385 "c" rebasing 2:177f92b77385 "c"
rebasing 3:055a42cdd887 "d" rebasing 3:055a42cdd887 "d"
rebasing 4:e860deea161a "e" rebasing 4:e860deea161a "e"
merging e merging e
warning: conflicts while merging e! (edit, then use 'hg resolve --mark') warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ hg rebase --abort $ hg rebase --abort
saved backup bundle to $TESTTMP/repo1/repo3/.hg/strip-backup/c1e524d4287c-f91f82e1-backup.hg saved backup bundle to $TESTTMP/repo3/.hg/strip-backup/c1e524d4287c-f91f82e1-backup.hg
rebase aborted rebase aborted
Retrying without in-memory merge won't lose working copy changes Retrying without in-memory merge won't lose working copy changes
$ cd .. $ cd ..
$ hg clone repo3 repo3-dirty -q $ hg clone repo3 repo3-dirty -q
$ cd repo3-dirty $ cd repo3-dirty
$ echo dirty > a $ echo dirty > a
$ hg rebase -s 2 -d 7 $ hg rebase -s 2 -d 7