Mercurial > hg
comparison tests/test-copy-move-merge.t @ 27596:c881367688fe
test-copy-move-merge.t: explicitly request changed version
We're going to change the default for this in an upcoming patch, but in this
instance we do want to continue picking the changed version.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Wed, 23 Dec 2015 12:41:20 -0800 |
| parents | 27b89a0957ec |
| children | 564a354f7f35 |
comparison
equal
deleted
inserted
replaced
| 27595:9e2d01707e71 | 27596:c881367688fe |
|---|---|
| 78 | 78 |
| 79 $ hg strip -r . --config extensions.strip= | 79 $ hg strip -r . --config extensions.strip= |
| 80 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 80 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 81 saved backup bundle to $TESTTMP/t/.hg/strip-backup/550bd84c0cd3-fc575957-backup.hg (glob) | 81 saved backup bundle to $TESTTMP/t/.hg/strip-backup/550bd84c0cd3-fc575957-backup.hg (glob) |
| 82 $ hg up -qC 2 | 82 $ hg up -qC 2 |
| 83 $ hg rebase --keep -d 1 -b 2 --config extensions.rebase= --config experimental.disablecopytrace=True | 83 $ hg rebase --keep -d 1 -b 2 --config extensions.rebase= --config experimental.disablecopytrace=True --config ui.interactive=True << EOF |
| 84 > c | |
| 85 > EOF | |
| 84 rebasing 2:add3f11052fa "other" (tip) | 86 rebasing 2:add3f11052fa "other" (tip) |
| 85 remote changed a which local deleted | 87 remote changed a which local deleted |
| 86 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c | 88 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
| 87 | 89 |
| 88 $ cat b | 90 $ cat b |