mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 00:14:35 +03:00
b3ac6d2456
When navigating through a patch series by qpushing and qpopping it was easy to get lost because qpop was silent. I found myself often running qnext after qpop to see which patch I just dropped - especially if I was about to qrm it. This patch makes qpop more symmetric to qpush by showing which patches are applied/"unapplied". I think it is a good change even though it changes output by adding a new line of output.
60 lines
1.6 KiB
Plaintext
60 lines
1.6 KiB
Plaintext
====== Setup main
|
|
adding one
|
|
====== Bundle main
|
|
2 changesets found
|
|
====== Incoming to fresh repo
|
|
>> hg -R fresh incoming main.hg
|
|
comparing with main.hg
|
|
0: main: one added.
|
|
1: main: one updated.
|
|
>> hg -R fresh incoming bundle:fresh+main.hg
|
|
comparing with bundle:fresh+main.hg
|
|
0: main: one added.
|
|
1: main: one updated.
|
|
====== Setup queue
|
|
adding two
|
|
popping two.patch
|
|
patch queue now empty
|
|
====== Bundle queue
|
|
1 changesets found
|
|
====== Clone base
|
|
updating working directory
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
====== Incoming queue bundle
|
|
>> hg -R .hg/patches incoming ../queue.hgq
|
|
comparing with ../queue.hgq
|
|
0: queue: two.patch added.
|
|
====== Pull queue bundle
|
|
>> hg -R .hg/patches pull --update ../queue.hgq
|
|
pulling from ../queue.hgq
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 3 changes to 3 files
|
|
merging series
|
|
2 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
>> hg -R .hg/patches heads
|
|
0: queue: two.patch added.
|
|
>> hg -R .hg/patches log
|
|
0: queue: two.patch added.
|
|
>> hg qseries
|
|
two.patch
|
|
====== Clone base again
|
|
updating working directory
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
====== Unbundle queue bundle
|
|
>> hg -R .hg/patches unbundle --update ../queue.hgq
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 3 changes to 3 files
|
|
merging series
|
|
2 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
>> hg -R .hg/patches heads
|
|
0: queue: two.patch added.
|
|
>> hg -R .hg/patches log
|
|
0: queue: two.patch added.
|
|
>> hg qseries
|
|
two.patch
|