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-convert-bzr-merges.out
author Matt Mackall <mpm@selenic.com>
Mon, 18 May 2009 17:36:24 -0500
changeset 8503 90f86a5330bb
parent 7053 209ef5f3534c
permissions -rw-r--r--
commit: tidy up mergestate slightly
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7053
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
     1
 
% test multiple merges at once
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
     2
 
initializing destination source-hg repository
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
     3
 
scanning source...
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
     4
 
sorting...
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
     5
 
converting...
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
     6
 
4 Initial add
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
     7
 
3 Added branch1 file
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
     8
 
2 Added parent file
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
     9
 
1 Added brach2 file
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
    10
 
0 Merged branches
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
    11
 
o    5 "(octopus merge fixup)" files:
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
    12
 
|\
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
    13
 
| o    4 "Merged branches" files: file-branch2
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
    14
 
| |\
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
    15
 
o---+  3 "Added brach2 file" files: file-branch2
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
    16
 
 / /
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
    17
 
| o  2 "Added parent file" files: file-parent
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
    18
 
| |
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
    19
 
o |  1 "Added branch1 file" files: file file-branch1
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
    20
 
|/
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
    21
 
o  0 "Initial add" files: file
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
    22
 












209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    23


% manifest of tip













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    24


644   file













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    25


644   file-branch1













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    26


644   file-branch2













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    27


644   file-parent















Mercurial