Mercurial > hg
annotate tests/test-backwards-remove.out @ 4884:931f901ab811
merge: fix unnecessary rename merges on linear update (issue631)
If one side's revision is identical to the ancestor, we skip the rest
of the copy detection logic.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 15 Jul 2007 14:43:38 -0500 |
parents | b2ae81a7df29 |
children |
rev | line source |
---|---|
383
4862a134e2c2
hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff
changeset
|
1 a |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
2 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
383
4862a134e2c2
hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff
changeset
|
3 a |