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

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

Get addremove to use new walk code....
Get addremove to use new walk code. It is now more verbose than it used to be. If given file names, it prints nothing, as before. But if given patterns or nothing, it prints the names of the files it is operating on, to remove that air of mystery. It also now operates at or below the current directory.
mpm@selenic.com - - Load All Authors

File last commit:

r749:7e4843b7 default
r766:b444a7e0 default
Show More
test-up-local-change.out
76 lines | 1.5 KiB | text/plain | TextLexer
/ tests / test-up-local-change.out
History | Annotation | Raw |Copy content |Copy permalink
+ mkdir r1
+ cd r1
+ hg init
+ echo a
+ hg addremove
+ hg commit -m 1 -d '0 0'
+ hg clone . ../r2
+ cd ../r2
+ hg up
+ echo abc
+ hg diff
+ sed 's/\(\(---\|+++\).*\)\t.*/\1/'
diff -r c19d34741b0a a
--- a/a
+++ b/a
@@ -1,1 +1,1 @@
-a
+abc
+ cd ../r1
+ echo b
+ echo a2
+ hg addremove
+ hg commit -m 2 -d '0 0'
+ cd ../r2
+ hg -q pull ../r1
+ hg status
M a
+ hg --debug up
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
+ hg --debug up -m
resolving manifests
force None allow 1 moddirstate True linear True
ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
+ hg parents
changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
tag: tip
user: test
date: Thu Jan 1 00:00:00 1970
summary: 2
+ hg -v history
changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
tag: tip
manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758
user: test
date: Thu Jan 1 00:00:00 1970
files: a b
description:
2
changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
user: test
date: Thu Jan 1 00:00:00 1970
files: a
description:
1
+ hg diff
+ sed 's/\(\(---\|+++\).*\)\t.*/\1/'
diff -r 1e71731e6fbb a
--- a/a
+++ b/a
@@ -1,1 +1,1 @@
-a2
+abc