Mercurial Mercurial > public > mercurial-scm > hg / diff
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-rebase-cache.out
changeset 12608 16b854cb80f1
parent 12607 1393a81b3bdc
child 12612 03c5737a06a1 
--- a/tests/test-rebase-cache.out	Fri Oct 01 16:43:03 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,168 +0,0 @@
-
-@  8:c11d5b3e9c00 F branch: branch3
-|
-o  7:33c9da881988 Branch3 branch: branch3
-|
-| o  6:0e4064ab11a3 E branch: branch2
-| |
-| o  5:5ac035cb5d8f D branch: branch2
-| |
-| | o  4:8e66061486ee C branch: branch2
-| | |
-+---o  3:99567862abbe Branch2 branch: branch2
-| |
-| o  2:65a26a4d12f6 B branch: branch1
-| |
-| o  1:0f3f3010ee16 Branch1 branch: branch1
-|/
-o  0:1994f17a630e A branch:
-
-
-% Branches
-branch3                        8:c11d5b3e9c00
-branch2                        6:0e4064ab11a3
-branch1                        2:65a26a4d12f6 (inactive)
-default                        0:1994f17a630e (inactive)
-
-% Heads
-8:c11d5b3e9c00 F branch: branch3
-6:0e4064ab11a3 E branch: branch2
-4:8e66061486ee C branch: branch2
-2:65a26a4d12f6 B branch: branch1
-0:1994f17a630e A branch: 
-
-% Rebase part of branch2 (5-6) onto branch3 (8)
-saved backup bundle to 
-
-% Branches
-branch3                        8:c9bfa9beb84e
-branch2                        4:8e66061486ee
-branch1                        2:65a26a4d12f6
-default                        0:1994f17a630e (inactive)
-
-% Heads
-8:c9bfa9beb84e E branch: branch3
-4:8e66061486ee C branch: branch2
-2:65a26a4d12f6 B branch: branch1
-0:1994f17a630e A branch: 
-
-@  8:c9bfa9beb84e E branch: branch3
-|
-o  7:bf9037384081 D branch: branch3
-|
-o  6:c11d5b3e9c00 F branch: branch3
-|
-o  5:33c9da881988 Branch3 branch: branch3
-|
-| o  4:8e66061486ee C branch: branch2
-| |
-| o  3:99567862abbe Branch2 branch: branch2
-|/
-| o  2:65a26a4d12f6 B branch: branch1
-| |
-| o  1:0f3f3010ee16 Branch1 branch: branch1
-|/
-o  0:1994f17a630e A branch:
-
-
-% Rebase head of branch3 (8) onto branch2 (6)
-@  8:c11d5b3e9c00 F branch: branch3
-|
-o  7:33c9da881988 Branch3 branch: branch3
-|
-| o  6:0e4064ab11a3 E branch: branch2
-| |
-| o  5:5ac035cb5d8f D branch: branch2
-| |
-| | o  4:8e66061486ee C branch: branch2
-| | |
-+---o  3:99567862abbe Branch2 branch: branch2
-| |
-| o  2:65a26a4d12f6 B branch: branch1
-| |
-| o  1:0f3f3010ee16 Branch1 branch: branch1
-|/
-o  0:1994f17a630e A branch:
-
-saved backup bundle to 
-
-% Branches
-branch2                        8:b44d3024f247
-branch3                        7:33c9da881988
-branch1                        2:65a26a4d12f6 (inactive)
-default                        0:1994f17a630e (inactive)
-
-% Heads
-8:b44d3024f247 F branch: branch2
-7:33c9da881988 Branch3 branch: branch3
-4:8e66061486ee C branch: branch2
-2:65a26a4d12f6 B branch: branch1
-0:1994f17a630e A branch: 
-
-@  8:b44d3024f247 F branch: branch2
-|
-| o  7:33c9da881988 Branch3 branch: branch3
-| |
-o |  6:0e4064ab11a3 E branch: branch2
-| |
-o |  5:5ac035cb5d8f D branch: branch2
-| |
-| | o  4:8e66061486ee C branch: branch2
-| | |
-| | o  3:99567862abbe Branch2 branch: branch2
-| |/
-o |  2:65a26a4d12f6 B branch: branch1
-| |
-o |  1:0f3f3010ee16 Branch1 branch: branch1
-|/
-o  0:1994f17a630e A branch:
-
-
-% Rebase entire branch3 (7-8) onto branch2 (6)
-@  8:c11d5b3e9c00 F branch: branch3
-|
-o  7:33c9da881988 Branch3 branch: branch3
-|
-| o  6:0e4064ab11a3 E branch: branch2
-| |
-| o  5:5ac035cb5d8f D branch: branch2
-| |
-| | o  4:8e66061486ee C branch: branch2
-| | |
-+---o  3:99567862abbe Branch2 branch: branch2
-| |
-| o  2:65a26a4d12f6 B branch: branch1
-| |
-| o  1:0f3f3010ee16 Branch1 branch: branch1
-|/
-o  0:1994f17a630e A branch:
-
-saved backup bundle to 
-
-% Branches
-branch2                        7:b44d3024f247
-branch1                        2:65a26a4d12f6 (inactive)
-default                        0:1994f17a630e (inactive)
-
-% Heads
-7:b44d3024f247 F branch: branch2
-4:8e66061486ee C branch: branch2
-2:65a26a4d12f6 B branch: branch1
-0:1994f17a630e A branch: 
-
-@  7:b44d3024f247 F branch: branch2
-|
-o  6:0e4064ab11a3 E branch: branch2
-|
-o  5:5ac035cb5d8f D branch: branch2
-|
-| o  4:8e66061486ee C branch: branch2
-| |
-| o  3:99567862abbe Branch2 branch: branch2
-| |
-o |  2:65a26a4d12f6 B branch: branch1
-| |
-o |  1:0f3f3010ee16 Branch1 branch: branch1
-|/
-o  0:1994f17a630e A branch:
-
mercurial-scm/hg