Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-update-reverse @ 1636:7da32bb3d1d3
contrib: add Chris Mason's stand-alone diff tool
This uses Mercurial's diff algorithm to generate unidiffs like the traditional diff tool.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 24 Jan 2006 14:49:19 +1300 |
parents | 3a0b69ea5708 |
children | 7544700fd931 |
line wrap: on
line source
#!/bin/sh hg init touch a hg add a hg commit -m "Added a" -d "0 0" touch main hg add main hg commit -m "Added main" -d "0 0" hg checkout 0 echo Main should be gone ls touch side1 hg add side1 hg commit -m "Added side1" -d "0 0" touch side2 hg add side2 hg commit -m "Added side2" -d "0 0" hg log echo Should have two heads, side2 and main hg heads echo Should show "a side1 side2" ls hg update --debug -C 1 echo Should only show "a main" ls