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Ā³
From 064acd3c1ef7524c2525fb9266ff5fe3251d23d3 Mon Sep 17 00:00:00 2001
From: Petr Viktorin <pvikt...@redhat.com>
Date: Thu, 5 Dec 2013 13:31:19 +0100
Subject: [PATCH] Add comment about last change to VERSION

When a branch with API version bump is rebased, but the version was
also bumped in master, Git thinks the change was already done and
loses it.

A comment unique to each change will cause a merge conflict in
this case, so the developer is reminded to update the number.
---
 VERSION | 1 +
 1 file changed, 1 insertion(+)

diff --git a/VERSION b/VERSION
index e7d7bc3eab38c57cd9c5b24f13c27a234b9c6f03..694f639d03bf9d02dc577b20358b6018609132d1 100644
--- a/VERSION
+++ b/VERSION
@@ -90,3 +90,4 @@ IPA_DATA_VERSION=20100614120000
 ########################################################
 IPA_API_VERSION_MAJOR=2
 IPA_API_VERSION_MINOR=70
+# Last change: npmccallum - RADIUS support
-- 
1.8.3.1

_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Reply via email to