Re: [PATCH v6 0/8] Multiple simultaneously locked ref updates
Brad King writes: > On 09/10/2013 12:30 PM, Junio C Hamano wrote: >> Thanks. I am not sure if I should rewind and rebuild the series >> with these patches, though. This is a new feature and does not have >> to be merged to 'maint', so rebasing is perfectly fine, but it is >> not strictly necessary, either. > > I just thought I'd help out with the conflict resolution. Yeah, such an independent confirmation of the conflict resolution is very much appreciated. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v6 0/8] Multiple simultaneously locked ref updates
On 09/10/2013 12:30 PM, Junio C Hamano wrote: > Thanks. I am not sure if I should rewind and rebuild the series > with these patches, though. This is a new feature and does not have > to be merged to 'maint', so rebasing is perfectly fine, but it is > not strictly necessary, either. I just thought I'd help out with the conflict resolution. If you're happy with resolving the conflicts in v5 then there is no reason to use v6. Thanks, -Brad -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v6 0/8] Multiple simultaneously locked ref updates
Brad King writes: > Updates since the previous revision of the series: > > * The entire series was rebased on master at bb80ee09; it was > previously based on v1.8.4. > > * A conflict in refs.c with 47a59185 was resolved by preserving > the elimination of find_ref_by_name while adding our new content. > > * A conflict in builtin/update-ref.c with d5d09d47 (Replace deprecated > OPT_BOOLEAN by OPT_BOOL, 2013-08-03) was resolved by integrating > both changes. The new options added in patch 7 now use OPT_BOOL. I just test-applied these on top of bb80ee09 (Update draft release notes to 1.8.5 for the second batch of topics, 2013-09-09), and compared the result with the result of merging the tip of the previous round 511910e1 (update-ref: add test cases covering --stdin signature, 2013-09-09) with bb80ee09, and they more-or-less match (the order of options[] array elements may differ in update-index.c), which validates that existing merge conflict resolution matches your expectation. Thanks. I am not sure if I should rewind and rebuild the series with these patches, though. This is a new feature and does not have to be merged to 'maint', so rebasing is perfectly fine, but it is not strictly necessary, either. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v6 0/8] Multiple simultaneously locked ref updates
Hi Folks, Here is the sixth revision of a series to support locking multiple refs at the same time to update all of them consistently. The previous revisions of the series can be found at $gmane/233260, $gmane/233458, $gmane/233647, $gmane/233840, and $gmane/234324. Updates since the previous revision of the series: * The entire series was rebased on master at bb80ee09; it was previously based on v1.8.4. * A conflict in refs.c with 47a59185 was resolved by preserving the elimination of find_ref_by_name while adding our new content. * A conflict in builtin/update-ref.c with d5d09d47 (Replace deprecated OPT_BOOLEAN by OPT_BOOL, 2013-08-03) was resolved by integrating both changes. The new options added in patch 7 now use OPT_BOOL. -Brad Brad King (8): reset: rename update_refs to reset_refs refs: report ref type from lock_any_ref_for_update refs: factor update_ref steps into helpers refs: factor delete_ref loose ref step into a helper refs: add function to repack without multiple refs refs: add update_refs for multiple simultaneous updates update-ref: support multiple simultaneous updates update-ref: add test cases covering --stdin signature Documentation/git-update-ref.txt | 54 +++- branch.c | 2 +- builtin/commit.c | 2 +- builtin/fetch.c | 3 +- builtin/receive-pack.c | 3 +- builtin/reflog.c | 2 +- builtin/replace.c| 2 +- builtin/reset.c | 4 +- builtin/tag.c| 2 +- builtin/update-ref.c | 252 ++- fast-import.c| 2 +- refs.c | 195 ++-- refs.h | 22 +- sequencer.c | 3 +- t/t1400-update-ref.sh| 639 +++ 15 files changed, 1146 insertions(+), 41 deletions(-) -- 1.8.4.rc3 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
