Mercurial > hg
annotate tests/test-bookmarks-rebase.out @ 11639:a0c5f531daab stable
doc: make sure we use our own code for generating man pages
docutils would in some situations pick up its own manpage.py instead of
doc/manpage.py. Renaming to hgmanpage.py makes it less ambiguous.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Wed, 21 Jul 2010 17:51:37 +0200 |
parents | 7a9cf012dddc |
children |
rev | line source |
---|---|
7317
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
1 % initialize repository |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
2 adding a |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
3 adding b |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
4 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
5 adding c |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
6 created new head |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
7 adding d |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
8 % bookmark list |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
9 * two 3:2ae46b1d99a7 |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
10 one 1:925d80f479bb |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
11 % rebase |
11201
34023f2ca305
Fix up rebase's handling of strip backups
Matt Mackall <mpm@selenic.com>
parents:
11197
diff
changeset
|
12 saved backup bundle to |
7317
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
13 changeset: 3:9163974d1cb5 |
11047
c7dbd6c4877a
tags: return tags in sorted order
Eric Eisner <ede@mit.edu>
parents:
7482
diff
changeset
|
14 tag: one |
7317
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
15 tag: tip |
7482 | 16 tag: two |
7317
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
17 parent: 1:925d80f479bb |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
18 parent: 2:db815d6d32e6 |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
19 user: test |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
20 date: Thu Jan 01 00:00:00 1970 +0000 |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
21 summary: 3 |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
22 |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
23 changeset: 2:db815d6d32e6 |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
24 parent: 0:f7b1eb17ad24 |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
25 user: test |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
26 date: Thu Jan 01 00:00:00 1970 +0000 |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
27 summary: 2 |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
28 |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
29 changeset: 1:925d80f479bb |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
30 user: test |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
31 date: Thu Jan 01 00:00:00 1970 +0000 |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
32 summary: 1 |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
33 |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
34 changeset: 0:f7b1eb17ad24 |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
35 user: test |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
36 date: Thu Jan 01 00:00:00 1970 +0000 |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
37 summary: 0 |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
38 |