##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

fix some rename/copy bugs...
fix some rename/copy bugs - delete copy information when we update dirstate hg was keeping the copy state and marking things as copied on multiple commits - files that are renamed should have no parents if you do a rename/copy to an existing file, it should not be marked as descending from its previous revisions. - remove spurious print from filelog.renamed - add some more copy tests
mpm@selenic.com - - Load All Authors

File last commit:

r981:4f81068e merge default
r1117:30ab5b8e default
Show More
test-up-local-change.out
50 lines | 982 B | text/plain | TextLexer
/ tests / test-up-local-change.out
History | Annotation | Raw |Copy content |Copy permalink
adding a
diff -r c19d34741b0a a
--- a/a
+++ b/a
@@ -1,1 +1,1 @@
-a
+abc
adding b
M a
resolving manifests
force None allow None moddirstate True linear True
ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
a versions differ, resolve
remote created b
getting b
merging a
resolving a
file a: other d730145abbf9 ancestor b789fdd96dc2
resolving manifests
force None allow 1 moddirstate True linear True
ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
changeset: 1:1e71731e6fbb
tag: tip
user: test
date: Thu Jan 1 00:00:00 1970 +0000
summary: 2
changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
tag: tip
user: test
date: Thu Jan 1 00:00:00 1970 +0000
files: a b
description:
2
changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
user: test
date: Thu Jan 1 00:00:00 1970 +0000
files: a
description:
1
diff -r 1e71731e6fbb a
--- a/a
+++ b/a
@@ -1,1 +1,1 @@
-a2
+abc