Mercurial > hg
annotate tests/test-update-renames.out @ 11835:14db59e3b248 stable
convert: Test svn sink for a repo with tags.
This test case backs the fix in changeset 7e5f5e5858f9. The subversion
sink used to crash, if the source repo used tags.
author | Daniel J. Lauk <daniel.lauk@gmail.com> |
---|---|
date | Thu, 12 Aug 2010 11:15:33 +0200 |
parents | 4f11978ae45d |
children |
rev | line source |
---|---|
10874
4f11978ae45d
copies: properly visit file context ancestors on working file contexts
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff
changeset
|
1 merging a and b to b |
4f11978ae45d
copies: properly visit file context ancestors on working file contexts
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff
changeset
|
2 warning: conflicts during merge. |
4f11978ae45d
copies: properly visit file context ancestors on working file contexts
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff
changeset
|
3 merging b failed! |
4f11978ae45d
copies: properly visit file context ancestors on working file contexts
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff
changeset
|
4 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
4f11978ae45d
copies: properly visit file context ancestors on working file contexts
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff
changeset
|
5 use 'hg resolve' to retry unresolved file merges |