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-bookmarks-rebase.out
author David Champion <dgc@uchicago.edu>
Mon, 10 May 2010 11:04:56 -0500
changeset 11148 a912f26777d3
parent 11047 c7dbd6c4877a
child 11197 4bb4895e1693
permissions -rw-r--r--
merge: introduce tool.check parameter tool.check is a list of check options, and can be used in place of tool.checkchanged and tool.checkconflicts: Equivalences: tool.checkchanged = yes tool.checkconflicts = no tool.check = changed tool.checkchanged = no tool.checkconflicts = yes tool.check = conflicts tool.checkchanged = yes tool.checkconflicts = yes tool.check = changed, conflicts Add _toollist() wrapper for ui.configlist() to implement this consistently. checkchanged and checkconflicts are still supported, but check is preferred for implementing new check options.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
98408cb74137 bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff changeset 
    12
 
saving bundle to
98408cb74137 bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff changeset 
    13
 
adding branch
98408cb74137 bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff changeset 
    14
 
adding changesets
98408cb74137 bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff changeset 
    15
 
adding manifests
98408cb74137 bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff changeset 
    16
 
adding file changes
98408cb74137 bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff changeset 
    17
 
added 1 changesets with 1 changes to 1 files (-1 heads)
98408cb74137 bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff changeset 
    18
 
rebase completed
98408cb74137 bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff changeset 
    19
 
changeset:   3:9163974d1cb5
11047
c7dbd6c4877a tags: return tags in sorted order
Eric Eisner <ede@mit.edu>
parents: 7482
diff changeset 
    20
 
tag:         one
7317
98408cb74137 bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff changeset 
    21
 
tag:         tip
7482
42cb14f20d76 bookmarks: Fix tests
David Soria Parra <dsp@php.net>
parents: 7317
diff changeset 
    22
 
tag:         two
7317
98408cb74137 bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff changeset 
    23
 
parent:      1:925d80f479bb
98408cb74137 bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff changeset 
    24
 
parent:      2:db815d6d32e6
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:     3
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:   2:db815d6d32e6













98408cb74137
bookmarks: Test if rebase works with bookmarks



Alexander Solovyov <piranha@piranha.org.ua>


parents: 

diff
changeset




    30


parent:      0:f7b1eb17ad24













98408cb74137
bookmarks: Test if rebase works with bookmarks



Alexander Solovyov <piranha@piranha.org.ua>


parents: 

diff
changeset




    31


user:        test













98408cb74137
bookmarks: Test if rebase works with bookmarks



Alexander Solovyov <piranha@piranha.org.ua>


parents: 

diff
changeset




    32


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




    33


summary:     2













98408cb74137
bookmarks: Test if rebase works with bookmarks



Alexander Solovyov <piranha@piranha.org.ua>


parents: 

diff
changeset




    34














98408cb74137
bookmarks: Test if rebase works with bookmarks



Alexander Solovyov <piranha@piranha.org.ua>


parents: 

diff
changeset




    35


changeset:   1:925d80f479bb













98408cb74137
bookmarks: Test if rebase works with bookmarks



Alexander Solovyov <piranha@piranha.org.ua>


parents: 

diff
changeset




    36


user:        test













98408cb74137
bookmarks: Test if rebase works with bookmarks



Alexander Solovyov <piranha@piranha.org.ua>


parents: 

diff
changeset




    37


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




    38


summary:     1













98408cb74137
bookmarks: Test if rebase works with bookmarks



Alexander Solovyov <piranha@piranha.org.ua>


parents: 

diff
changeset




    39














98408cb74137
bookmarks: Test if rebase works with bookmarks



Alexander Solovyov <piranha@piranha.org.ua>


parents: 

diff
changeset




    40


changeset:   0:f7b1eb17ad24













98408cb74137
bookmarks: Test if rebase works with bookmarks



Alexander Solovyov <piranha@piranha.org.ua>


parents: 

diff
changeset




    41


user:        test













98408cb74137
bookmarks: Test if rebase works with bookmarks



Alexander Solovyov <piranha@piranha.org.ua>


parents: 

diff
changeset




    42


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




    43


summary:     0













98408cb74137
bookmarks: Test if rebase works with bookmarks



Alexander Solovyov <piranha@piranha.org.ua>


parents: 

diff
changeset




    44
















Mercurial