On Wed, Aug 28, 2013 at 09:15:11PM -0500, Paul Elliott wrote:
> On Wed, Aug 28, 2013 at 09:44:56PM +0200, Bernhard R. Link wrote:
> If you have a patch that deletes a file, and then
> delete that patch, the file should reappear.
> It does on the patched branch, but when update-patches
> happens the deleted file does not reappear on the master
> branch.
> If you do a dpkg-source -b on the master branch directory, dpkg-source
> notices the discrepancy of the deleted file and gives you a warning.

I should have used --ignore-deletions on the update-patches.

It is counter intuitive to need --ignore-deletions when
you really want git-dpm to pay attention to deletions
to resore what had been deleted.

Perhaps the documentation or the switch name could be changed.

Paul Elliott                               1(512)837-1096
pelli...@blackpatchpanel.com               PMB 181, 11900 Metric Blvd Suite J
http://www.free.blackpatchpanel.com/pme/   Austin TX 78758-3117
"Encryption works. Properly implemented strong crypto systems are one
of the few things that you can rely on. Unfortunately, endpoint
security is so terrifically weak that NSA can frequently find ways
around it." Edward Snowden

Attachment: signature.asc
Description: Digital signature

Git-dpm-user mailing list

Reply via email to