Introducing Shelf 2

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1


...

>> I'd rather not make bzr depend on patch if we can help it.
> 
> What you proposed is very close to what I implemented.  But both of them
> still require applying patches to the base text, and that is what causes
> bzr to depend on patch.

Ok. I thought you used patch to apply the changes to the working files.
Though I thought I saw you using 3-way merge as well. Obviously I didn't
understand where patch was being invoked.

> 
>> It sounds like we would still need to teach shelf to update the hunk
>> positions, and then also store extra information.
> 
> Okay, so you're voting in favour of avoiding the dependency by making
> shelf smarter, and using our homegrown patch-application code.

Yeah.

> 
>> It may be more work than you think is worthwhile, though I think the
>> end-result would be nicer.
> 
> I think that this is probably the simplest way of removing the
> dependency.  Unless I'm mistaken, it only requires maintaining an offset
> and applying that offset to patch hunks.
> 
> Aaron

That is what it sounds like to me. You are only "removing" patch hunks,
so you just have to say "this hunk would add/remove N lines, so I need
to offset this hunk by N".

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkjvz3cACgkQJdeBCYSNAANBVgCggJm2IlaWnanU43xr09BEb67n
u60An3tcp9ZIpUKhDLF/YbzOA4/hYHzm
=DBqh
-----END PGP SIGNATURE-----