author | Thomas Arendsen Hein <thomas@intevation.de> |
Wed, 13 Jun 2007 08:24:40 +0200 | |
changeset 4565 | 8b87bd4fb7ce |
parent 4536 | 720ae5085ee3 |
permissions | -rw-r--r-- |
4536
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
1 |
adding a |
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
2 |
adding b |
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
3 |
pulling from ../a |
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
4 |
searching for changes |
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
5 |
warning: repository is unrelated |
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
6 |
adding changesets |
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
7 |
adding manifests |
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
8 |
adding file changes |
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
9 |
added 1 changesets with 1 changes to 1 files (+1 heads) |
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
10 |
(run 'hg heads' to see heads, 'hg merge' to merge) |
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
11 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
12 |
(branch merge, don't forget to commit) |
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
13 |
C b |