mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 08:18:15 +03:00
3efa776f85
This message may be confused with an error message. Adding parenthesis around it will make it more recognisable as an informative message.
152 lines
2.4 KiB
Perl
152 lines
2.4 KiB
Perl
$ cat >> $HGRCPATH <<EOF
|
|
> [extensions]
|
|
> rebase=
|
|
>
|
|
> [phases]
|
|
> publish=False
|
|
>
|
|
> [alias]
|
|
> tglog = log -G --template "{rev}:{phase} '{desc}' {branches}\n"
|
|
> EOF
|
|
|
|
|
|
$ hg init a
|
|
$ cd a
|
|
|
|
$ echo A > A
|
|
$ hg add A
|
|
$ hg ci -m A
|
|
|
|
$ echo 'B' > B
|
|
$ hg add B
|
|
$ hg ci -m B
|
|
|
|
$ echo C >> A
|
|
$ hg ci -m C
|
|
|
|
$ hg up -q -C 0
|
|
|
|
$ echo D >> A
|
|
$ hg ci -m D
|
|
created new head
|
|
|
|
$ echo E > E
|
|
$ hg add E
|
|
$ hg ci -m E
|
|
|
|
$ hg up -q -C 0
|
|
|
|
$ hg branch 'notdefault'
|
|
marked working directory as branch notdefault
|
|
(branches are permanent and global, did you want a bookmark?)
|
|
$ echo F >> A
|
|
$ hg ci -m F
|
|
|
|
$ cd ..
|
|
|
|
|
|
Rebasing B onto E - check keep: and phases
|
|
|
|
$ hg clone -q -u . a a1
|
|
$ cd a1
|
|
$ hg phase --force --secret 2
|
|
|
|
$ hg tglog
|
|
@ 5:draft 'F' notdefault
|
|
|
|
|
| o 4:draft 'E'
|
|
| |
|
|
| o 3:draft 'D'
|
|
|/
|
|
| o 2:secret 'C'
|
|
| |
|
|
| o 1:draft 'B'
|
|
|/
|
|
o 0:draft 'A'
|
|
|
|
$ hg rebase -s 1 -d 4 --keep
|
|
merging A
|
|
warning: conflicts during merge.
|
|
merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
|
|
unresolved conflicts (see hg resolve, then hg rebase --continue)
|
|
[1]
|
|
|
|
Solve the conflict and go on:
|
|
|
|
$ echo 'conflict solved' > A
|
|
$ rm A.orig
|
|
$ hg resolve -m A
|
|
(no more unresolved files)
|
|
$ hg rebase --continue
|
|
|
|
$ hg tglog
|
|
o 7:secret 'C'
|
|
|
|
|
o 6:draft 'B'
|
|
|
|
|
| @ 5:draft 'F' notdefault
|
|
| |
|
|
o | 4:draft 'E'
|
|
| |
|
|
o | 3:draft 'D'
|
|
|/
|
|
| o 2:secret 'C'
|
|
| |
|
|
| o 1:draft 'B'
|
|
|/
|
|
o 0:draft 'A'
|
|
|
|
$ cd ..
|
|
|
|
|
|
Rebase F onto E - check keepbranches:
|
|
|
|
$ hg clone -q -u . a a2
|
|
$ cd a2
|
|
$ hg phase --force --secret 2
|
|
|
|
$ hg tglog
|
|
@ 5:draft 'F' notdefault
|
|
|
|
|
| o 4:draft 'E'
|
|
| |
|
|
| o 3:draft 'D'
|
|
|/
|
|
| o 2:secret 'C'
|
|
| |
|
|
| o 1:draft 'B'
|
|
|/
|
|
o 0:draft 'A'
|
|
|
|
$ hg rebase -s 5 -d 4 --keepbranches
|
|
merging A
|
|
warning: conflicts during merge.
|
|
merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
|
|
unresolved conflicts (see hg resolve, then hg rebase --continue)
|
|
[1]
|
|
|
|
Solve the conflict and go on:
|
|
|
|
$ echo 'conflict solved' > A
|
|
$ rm A.orig
|
|
$ hg resolve -m A
|
|
(no more unresolved files)
|
|
$ hg rebase --continue
|
|
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
|
|
|
|
$ hg tglog
|
|
@ 5:draft 'F' notdefault
|
|
|
|
|
o 4:draft 'E'
|
|
|
|
|
o 3:draft 'D'
|
|
|
|
|
| o 2:secret 'C'
|
|
| |
|
|
| o 1:draft 'B'
|
|
|/
|
|
o 0:draft 'A'
|
|
|
|
|
|
$ cd ..
|