##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

mq: add parent node IDs to MQ patches on qrefresh/qnew...
mq: add parent node IDs to MQ patches on qrefresh/qnew The goal of this patch is to add the IDs of the parents of applied MQ patches into the patch file headers whenever qnew or qrefresh are run. This will serve as a reminder of when the patches last applied cleanly and will let us do more intelligent things in the future, such as: * Resolve conflicts found when qpushing to a new location by merging instead of simply showing rejects. * Display better diffs of versioned MQ patches because we can tell how the patched files have changed in the meantime. Here are the new rules this patch introduces. They are checked in this order: * If a patch currently has old, plain-style patch headers ("From:" and "Date:") do not change the style or add any new headers. * If the 'mq.plain' configuration setting is true, only plain-style headers will be used for all MQ patches. * qnew will initialize new patches with HG-style headers and fill in the "# Parent" header with the appropriate parent node. * qrefresh will refresh the "# Parent" header with the current parent of the current patch.
Wagner Bruna - - Load All Authors

File last commit:

r10154:d4a62b6d stable
r10397:8cb81d75 default
Show More
test-incoming-outgoing
54 lines | 1.3 KiB | text/plain | TextLexer
/ tests / test-incoming-outgoing
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
mkdir test
cd test
hg init
for i in 0 1 2 3 4 5 6 7 8; do
echo $i >> foo
hg commit -A -m $i -d "1000000 0"
done
hg verify
hg serve -p $HGPORT -d --pid-file=hg.pid
cat hg.pid >> $DAEMON_PIDS
cd ..
hg init new
# http incoming
hg -R new incoming http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,'
hg -R new incoming -r 4 http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,'
# local incoming
hg -R new incoming test
hg -R new incoming -r 4 test
echo "% limit to 2 changesets"
hg -R new incoming -l 2 test
echo "% limit to 2 changesets, test with -p --git"
hg -R new incoming -l 2 -p --git test
# test with --bundle
hg -R new incoming --bundle test.hg http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,'
hg -R new incoming --bundle test2.hg test
# test the resulting bundles
hg init temp
hg init temp2
hg -R temp unbundle test.hg
hg -R temp2 unbundle test2.hg
hg -R temp tip
hg -R temp2 tip
rm -r temp temp2 new
# test outgoing
hg clone test test-dev
cd test-dev
for i in 9 10 11 12 13; do
echo $i >> foo
hg commit -A -m $i -d "1000000 0"
done
hg verify
cd ..
hg -R test-dev outgoing test
echo "% limit to 3 changesets"
hg -R test-dev outgoing -l 3 test
hg -R test-dev outgoing http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,'
hg -R test-dev outgoing -r 11 http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,'