Mercurial > hg
changeset 4821:f48290864625
Merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 05 Jul 2007 16:17:01 -0500 |
| parents | 616a5adbf402 (current diff) 8706e75e6431 (diff) |
| children | 61343b40a141 |
| files | tests/test-issue612 |
| diffstat | 3 files changed, 38 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Thu Jul 05 15:37:23 2007 -0500 +++ b/mercurial/merge.py Thu Jul 05 16:17:01 2007 -0500 @@ -478,6 +478,9 @@ repo.dirstate.forget([f]) elif m == "d": # directory rename f2, fd, flag = a[2:] + if not f2 and f not in repo.dirstate: + # untracked file moved + continue if branchmerge: repo.dirstate.update([fd], 'a') if f:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-issue612 Thu Jul 05 16:17:01 2007 -0500 @@ -0,0 +1,24 @@ +#!/bin/sh + +mkdir t +cd t + +hg init +mkdir src +echo a > src/a.c +hg ci -Ama -d "10000000 0" + +hg mv src source +hg ci -Ammove -d "1000000 0" + +hg co -C 0 +echo new > src/a.c +echo compiled > src/a.o +hg ci -mupdate -d "1000000 0" + +hg st + +hg merge + +hg st +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-issue612.out Thu Jul 05 16:17:01 2007 -0500 @@ -0,0 +1,11 @@ +adding src/a.c +copying src/a.c to source/a.c +removing src/a.c +1 files updated, 0 files merged, 1 files removed, 0 files unresolved +? src/a.o +merging src/a.c and source/a.c +1 files updated, 1 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) +M source/a.c +R src/a.c +? source/a.o