Mercurial > hg
view tests/test-diff-subdir @ 2897:dd032b0f02ac
merge: move forgets to the apply stage
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 15 Aug 2006 18:30:21 -0500 |
parents | 51b8d1ca7820 |
children | 096f1c73cdc3 |
line wrap: on
line source
#!/bin/sh hg init mkdir alpha touch alpha/one mkdir beta touch beta/two hg add alpha/one beta/two hg ci -m "start" -d "1000000 0" echo 1 > alpha/one echo 2 > beta/two echo EVERYTHING hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" echo BETA ONLY hg diff beta | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" echo INSIDE BETA cd beta hg diff . | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"