Hello,
I have a question regarding how to handle check-ins that include both a
merge into a branch from trunk (or another branch) and new code.
Specifically, when such an event happens, is it possible when using the
ui (or command line) to view a vdiff between the previous checkin
On Sat, Jan 4, 2014 at 12:34 PM, Andy Bradford amb-fos...@bradfords.orgwrote:
Hello,
I have a question regarding how to handle check-ins that include both a
merge into a branch from trunk (or another branch) and new code.
Specifically, when such an event happens, is it possible
Thus said Richard Hipp on Sat, 04 Jan 2014 13:13:11 -0500:
From the link above click on family. That shows a small graph
which contains the [555c44eb5d] check-in together with its parents
and children. In that graph, click once on the primary parent
([4f32dced74]) then a
On Sat, Jan 4, 2014 at 8:36 PM, Andy Bradford amb-fos...@bradfords.orgwrote:
I am trying to do is see the difference between
[4f32dced74] and [555c44eb5d] as if [b7fff13a0aa] had not been merged
Maybe this is what you want:
fossil up 4f32dced74
fossil merge b7ff13a0aa
fossil diff
Thus said Richard Hipp on Sat, 04 Jan 2014 21:06:50 -0500:
Maybe this is what you want:
fossil up 4f32dced74
fossil merge b7ff13a0aa
fossil diff --from 555c44eb5d
Yes, this is one way of accomplishing what I want, thank you.
Andy
--
TAI64 timestamp: 400052c8c28d
5 matches
Mail list logo
