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 Kevin Christen <kevin.christen@gmail.com>
Mon, 07 Jan 2008 21:29:40 -0600
changeset 5820 3a1ffc1da32c
parent 4696 59b8f9361545
child 5863 3d1f9dcecdea
permissions -rw-r--r--
Fixed numerous XHTML problems that caused validation errors and warnings. Link elements for Atom and RSS feeds had no end tag. <div> block element inside <a> in-line element isn't right and caused rendering problems on Safari. Spurious </div> tag in search forms. Branch entry missing closing </a> tag.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4696
59b8f9361545 tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
     1
 
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 
     2
 
pulling from ../a
59b8f9361545 tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
     3
 
searching for changes
59b8f9361545 tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
     4
 
adding changesets
59b8f9361545 tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
     5
 
adding manifests
59b8f9361545 tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
     6
 
adding file changes
59b8f9361545 tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
     7
 
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 
     8
 
(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 
     9
 
0 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 
    10
 
merging testdir/subdir/a and testdir/a
59b8f9361545 tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
    11
 
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 
    12
 
(branch merge, don't forget to commit)
59b8f9361545 tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
    13
 
M testdir/subdir/a
59b8f9361545 tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
    14
 
diff -r d02b3fc32762 testdir/subdir/a
59b8f9361545 tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
    15
 
--- a/testdir/subdir/a
59b8f9361545 tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
    16
 
+++ b/testdir/subdir/a
59b8f9361545 tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
    17
 
@@ -1,1 +1,1 @@ a
59b8f9361545 tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
    18
 
-a
59b8f9361545 tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
    19
 
+alpha
Mercurial