[Freeipa-devel] [PATCH] 0330 - Add comment about last change to VERSION

[Petr Viktorin]

Consider this scenario:

- Nathaniel submits RADIUS patches that update the API version (from 
2.69 to 2.70)
- I have ACI patches that also bump the version (from 2.69 to 2.70)
- Nathaniel's patches gets accepted
- I rebase my ACI patches onto master. Git thinks that the 2.69->2.70 
change is already done, so it leaves VERSION unchanged.

I can solve this locally by telling Git to not merge VERSION 
automatically, but I think it would be helpful to add a unique comment 
to each change so that everyone gets a conflict cases like this.
Do you agree?

-- 
Petr³
-------------- next part --------------
A non-text attachment was scrubbed...
Name: freeipa-pviktori-0330-Add-comment-about-last-change-to-VERSION.patch
Type: text/x-patch
Size: 902 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/freeipa-devel/attachments/20131205/069708a6/attachment.bin>