Mercurial > hg
view tests/test-merge-revert2 @ 2019:ced2d3620f95
add merge command. means same thing as "update -m".
repo.addchangegroup method now returns number of heads modified and added,
so command line can tell whether update or merge needed. this makes
tiny change to ssh wire protocol, but change is backwards compatible.
pull command now returns 0 if no changes to pull.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Wed, 29 Mar 2006 10:27:16 -0800 |
parents | 7544700fd931 |
children | d436b21b20dc |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init echo "added file1" > file1 echo "another line of text" >> file1 echo "added file2" > file2 hg add file1 file2 hg commit -m "added file1 and file2" -d "1000000 0" -u user echo "changed file1" >> file1 hg commit -m "changed file1" -d "1000000 0" -u user hg -q log hg id hg update -C 0 hg id echo "changed file1" >> file1 hg id hg revert hg diff hg status hg id hg update hg diff hg status hg id hg update -C 0 echo "changed file1 different" >> file1 HGMERGE=merge hg update hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(<<<<<<<\) .*/\1/" \ -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(>>>>>>>\) .*/\1/" hg status hg id hg revert hg diff hg status hg id hg revert -r tip hg diff hg status hg id hg update -C hg diff hg status hg id cd ..; /bin/rm -rf t