Mercurial Mercurial > hg / 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-merge10.out
author timeless@mozdev.org
Mon, 03 Aug 2009 10:39:14 +0200
changeset 9304 9219037fc0a6
parent 6512 368a4ec603cc
child 9611 a3d73b3e1f8a
permissions -rw-r--r--
hgwebdir: add links to the main repository page in notfound.tmpl
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6338
0750f11152fe clone: print "updating working directory" status message
Adrian Buehlmann <adrian@cadifra.com>
parents: 5863
diff changeset 
     1
 
updating working directory
4696
59b8f9361545 tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
     2
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
59b8f9361545 tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
     3
 
pulling from ../a
59b8f9361545 tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
     4
 
searching for changes
59b8f9361545 tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
     5
 
adding changesets
59b8f9361545 tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
     6
 
adding manifests
59b8f9361545 tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
     7
 
adding file changes
59b8f9361545 tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
     8
 
added 1 changesets with 1 changes to 1 files (+1 heads)
59b8f9361545 tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
     9
 
(run 'hg heads' to see heads, 'hg merge' to merge)
59b8f9361545 tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
    10
 
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6338
diff changeset 
    11
 
merging testdir/subdir/a and testdir/a to testdir/subdir/a
4696
59b8f9361545 tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
    12
 
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
59b8f9361545 tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
    13
 
(branch merge, don't forget to commit)
59b8f9361545 tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
    14
 
M testdir/subdir/a
59b8f9361545 tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
    15
 
diff -r d02b3fc32762 testdir/subdir/a
59b8f9361545 tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
    16
 
--- a/testdir/subdir/a
59b8f9361545 tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
    17
 
+++ b/testdir/subdir/a
5863
3d1f9dcecdea diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents: 4696
diff changeset 
    18
 
@@ -1,1 +1,1 @@
4696
59b8f9361545 tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
    19
 
-a
59b8f9361545 tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
    20
 
+alpha
Mercurial