Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge-symlinks.out
author Kirill Smelkov <kirr@landau.phys.spbu.ru>
Sat, 13 Oct 2007 15:25:11 +0400
changeset 5462 91a522a69c13
parent 5408 36794dbe66a3
permissions -rw-r--r--
convert: svn -- fix tags handling They were simply not detected.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5408
36794dbe66a3 Test workingctx exec/link bit for copies.
Patrick Mezard <pmezard@gmail.com>
parents: 5391
diff changeset 
     1
 
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
5391
786c1206a029 Test *_ISLINK merge environment vars
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     2
 
% merge heads
5408
36794dbe66a3 Test workingctx exec/link bit for copies.
Patrick Mezard <pmezard@gmail.com>
parents: 5391
diff changeset 
     3
 
HG_FILE l
5391
786c1206a029 Test *_ISLINK merge environment vars
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     4
 
HG_MY_ISLINK 1
786c1206a029 Test *_ISLINK merge environment vars
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     5
 
HG_OTHER_ISLINK 0
786c1206a029 Test *_ISLINK merge environment vars
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     6
 
HG_BASE_ISLINK 0
786c1206a029 Test *_ISLINK merge environment vars
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     7
 
merging l
786c1206a029 Test *_ISLINK merge environment vars
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     8
 
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
786c1206a029 Test *_ISLINK merge environment vars
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     9
 
(branch merge, don't forget to commit)
5408
36794dbe66a3 Test workingctx exec/link bit for copies.
Patrick Mezard <pmezard@gmail.com>
parents: 5391
diff changeset 
    10
 
% merge working directory
36794dbe66a3 Test workingctx exec/link bit for copies.
Patrick Mezard <pmezard@gmail.com>
parents: 5391
diff changeset 
    11
 
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
36794dbe66a3 Test workingctx exec/link bit for copies.
Patrick Mezard <pmezard@gmail.com>
parents: 5391
diff changeset 
    12
 
HG_FILE l2
36794dbe66a3 Test workingctx exec/link bit for copies.
Patrick Mezard <pmezard@gmail.com>
parents: 5391
diff changeset 
    13
 
HG_MY_ISLINK 1
36794dbe66a3 Test workingctx exec/link bit for copies.
Patrick Mezard <pmezard@gmail.com>
parents: 5391
diff changeset 
    14
 
HG_OTHER_ISLINK 0
36794dbe66a3 Test workingctx exec/link bit for copies.
Patrick Mezard <pmezard@gmail.com>
parents: 5391
diff changeset 
    15
 
HG_BASE_ISLINK 0
36794dbe66a3 Test workingctx exec/link bit for copies.
Patrick Mezard <pmezard@gmail.com>
parents: 5391
diff changeset 
    16
 
merging l2
36794dbe66a3 Test workingctx exec/link bit for copies.
Patrick Mezard <pmezard@gmail.com>
parents: 5391
diff changeset 
    17
 
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
mercurial-crew-with-dirclash