Mercurial > hg
view tests/test-mq-header-from @ 6297:fed1a9c22076
dirstate.remove: during merges, remember the previous file state
We encode the previous state as a negative file size (AFAICS, previous
versions of hg always have size == 0 when state == 'r').
We save the state of 'm'erged and dirty files, because they're the
two states that indicate that a file has to be committed on a merge
to correctly record per-file history.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Tue, 18 Mar 2008 04:07:39 -0300 |
parents | 38b592536a58 |
children | fb32ae9c76e7 |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH echo "[diff]" >> $HGRCPATH echo "nodates=true" >> $HGRCPATH catlog() { cat .hg/patches/$1.patch | sed -e "s/^diff \-r [0-9a-f]* /diff -r ... /" hg log --template "{rev}: {desc} - {author}\n" } echo ==== init hg init a cd a hg qinit echo ==== qnew -U hg qnew -U 1.patch catlog 1 echo ==== qref echo "1" >1 hg add hg qref catlog 1 echo ==== qref -u hg qref -u mary catlog 1 echo ==== qnew hg qnew 2.patch echo "2" >2 hg add hg qref catlog 2 echo ==== qref -u hg qref -u jane catlog 2 echo ==== qnew -U -m hg qnew -U -m "Three" 3.patch catlog 3 echo ==== qref echo "3" >3 hg add hg qref catlog 3 echo ==== qref -m hg qref -m "Drei" catlog 3 echo ==== qref -u hg qref -u mary catlog 3 echo ==== qref -u -m hg qref -u maria -m "Three (again)" catlog 3 echo ==== qnew -m hg qnew -m "Four" 4.patch echo "4" >4 hg add hg qref catlog 4 echo ==== qref -u hg qref -u jane catlog 4 echo ==== qnew with HG header hg qnew 5.patch hg qpop echo "# HG changeset patch" >>.hg/patches/5.patch echo "# User johndoe" >>.hg/patches/5.patch hg qpush 2>&1 | grep 'Now at' catlog 5 echo ==== hg qref echo "5" >5 hg add hg qref catlog 5 echo ==== hg qref -U hg qref -U catlog 5 echo ==== hg qref -u hg qref -u johndeere catlog 5 echo ==== "qpop -a / qpush -a" hg qpop -a hg qpush -a hg log --template "{rev}: {desc} - {author}\n"