equal
deleted
inserted
replaced
40 |
40 |
41 Test issue 1635 (commit message saved) |
41 Test issue 1635 (commit message saved) |
42 $ cat .hg/last-message.txt ; echo |
42 $ cat .hg/last-message.txt ; echo |
43 modify a |
43 modify a |
44 |
44 |
45 Test rollback of hg before issue 902 was fixed |
45 |
46 |
46 working dir unaffected by rollback: do not restore dirstate et. al. |
47 $ hg commit -m "test3" |
47 $ hg branch test --quiet |
48 $ hg branch test |
|
49 marked working directory as branch test |
|
50 (branches are permanent and global, did you want a bookmark?) |
|
51 $ rm .hg/undo.branch |
|
52 $ hg rollback |
|
53 repository tip rolled back to revision 0 (undo commit) |
|
54 named branch could not be reset: current branch is still 'test' |
|
55 working directory now based on revision 0 |
|
56 $ hg branch |
48 $ hg branch |
57 test |
49 test |
58 |
|
59 working dir unaffected by rollback: do not restore dirstate et. al. |
|
60 $ hg log --template '{rev} {branch} {desc|firstline}\n' |
50 $ hg log --template '{rev} {branch} {desc|firstline}\n' |
61 0 default add a again |
51 0 default add a again |
62 $ hg status |
52 $ hg status |
63 M a |
53 M a |
64 $ hg bookmark foo |
54 $ hg bookmark foo |
80 o 0 [default] (bar) add a again |
70 o 0 [default] (bar) add a again |
81 |
71 |
82 $ hg update bar |
72 $ hg update bar |
83 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
73 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
84 (activating bookmark bar) |
74 (activating bookmark bar) |
85 $ cat .hg/undo.branch ; echo |
75 $ cat .hg/undo.backup.branch |
86 test |
76 test |
87 $ hg log -G --template '{rev} [{branch}] ({bookmarks}) {desc|firstline}\n' |
77 $ hg log -G --template '{rev} [{branch}] ({bookmarks}) {desc|firstline}\n' |
88 o 2 [test] (foo) add b |
78 o 2 [test] (foo) add b |
89 | |
79 | |
90 o 1 [test] () modify a again |
80 o 1 [test] () modify a again |