On 8/6/2015 5:24 PM, Warren Young wrote:
On Aug 5, 2015, at 9:45 AM, Andy Goth andrew.m.g...@gmail.com wrote:
On 8/4/2015 3:53 PM, Warren Young wrote:
the chunks might have been modified before being checked in.
Stash saves the contents of the new file, along with the baseline
version. It does not save a list of diffs from the old to the new.
Hmmm…that means if you modify a chunk before checking it in, the next
--partial call will offer to *reverse* the changes you just made to
that chunk. Kind of annoying.
Guess that means the stash would also need to be updated to merge the
extra changes back. This gets complicated to point that doing things by
hand doesn't look so bad anymore.
If someone can figure out a nice way to handle it, great. But I'm not
really interested in doing that work myself since I have a process. The
process is bothersome enough to discourage the underlying problem, that
being making a lot of changes without being diligent about checking them
in as logical units.
--
Andy Goth | andrew.m.goth/at/gmail/dot/com
signature.asc
Description: OpenPGP digital signature
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
