Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change.out @ 2955:9d1c3529ebbc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
addremove: do not deprecate. command is too useful to drop. is also best place to try autodetect of rename/copy by content similarity.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sun, 23 Jul 2006 09:04:14 -0700
parents bb403d427974
children 6dddcba7596a
comparison
equal deleted inserted replaced
2640:02b6fa7bbfbf 2955:9d1c3529ebbc
1 (the addremove command is deprecated; use add and remove --after instead)
2 adding a 1 adding a
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
5 diff -r 33aaa84a386b a 4 diff -r 33aaa84a386b a
6 --- a/a 5 --- a/a
7 +++ b/a 6 +++ b/a
8 @@ -1,1 +1,1 @@ a 7 @@ -1,1 +1,1 @@ a
9 -a 8 -a
10 +abc 9 +abc
11 (the addremove command is deprecated; use add and remove --after instead)
12 adding b 10 adding b
13 M a 11 M a
14 changeset: 0:33aaa84a386b 12 changeset: 0:33aaa84a386b
15 user: test 13 user: test
16 date: Mon Jan 12 13:46:40 1970 +0000 14 date: Mon Jan 12 13:46:40 1970 +0000
88 +++ b/a 86 +++ b/a
89 @@ -1,1 +1,1 @@ a2 87 @@ -1,1 +1,1 @@ a2
90 -a2 88 -a2
91 +abc 89 +abc
92 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 90 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
93 (the addremove command is deprecated; use add and remove --after instead)
94 adding b 91 adding b
95 M a 92 M a
96 changeset: 1:802f095af299 93 changeset: 1:802f095af299
97 user: test 94 user: test
98 date: Mon Jan 12 13:46:40 1970 +0000 95 date: Mon Jan 12 13:46:40 1970 +0000