hgbook

diff en/examples/mq.id.out.out @ 356:0db175abfaf3

some friggin' merge or something like that.
author jerojasro@localhost
date Tue Oct 21 22:41:51 2008 -0500 (2008-10-21)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/en/examples/mq.id.out.out	Tue Oct 21 22:41:51 2008 -0500
     1.3 @@ -0,0 +1,32 @@
     1.4 +$ \textbf{hg qapplied}
     1.5 +first.patch
     1.6 +second.patch
     1.7 +$ \textbf{hg log -r qbase:qtip}
     1.8 +changeset:   
     1.9 +tag:         first.patch
    1.10 +tag:         qbase
    1.11 +user:        Bryan O'Sullivan <bos@serpentine.com>
    1.12 +
    1.13 +summary:     patch queue: first.patch
    1.14 +
    1.15 +changeset:   
    1.16 +tag:         second.patch
    1.17 +tag:         qtip
    1.18 +tag:         tip
    1.19 +user:        Bryan O'Sullivan <bos@serpentine.com>
    1.20 +
    1.21 +summary:     patch queue: second.patch
    1.22 +
    1.23 +$ \textbf{hg export second.patch}
    1.24 +# HG changeset patch
    1.25 +# User Bryan O'Sullivan <bos@serpentine.com>
    1.26 +
    1.27 +# Node ID 
    1.28 +# Parent  
    1.29 +patch queue: second.patch
    1.30 +
    1.31 +diff -r  -r  other.c
    1.32 +
    1.33 +
    1.34 +@@ -0,0 +1,1 @@
    1.35 ++double u;