Catalin Marinas <catalin.marinas@gmail.com> writes: > A new StGIT release is available from http://procode.org/stgit/ > > What's new in version 0.3: > * closer to the Quilt functionality > * there is only one commit object per patch which can be > indefinitely modified using the 'refresh' command. The commit > objects are stacked on top of the base and can also be accessed > via standard GIT commands > * no 'commit' command. Use 'refresh' instead > > StGIT is a Python application providing similar functionality to Quilt > (i.e. pushing/popping patches to/from a stack) on top of GIT. These > operations are performed using GIT commands and the patches are stored > as GIT commit objects, allowing easy merging of the StGIT patches into > other repositories using standard GIT functionality. This is good stuff and the 3-way merge really simplifies things. However, if there is a merge conflict, you will basically be stuck with a 2-way merge when resolving manually. It's usually much easier if you can see all three version, so I think it's better to use -A instead of -E in the diff3 command. --- stgit-0.3/gitmergeonefile.py~ 2005-06-28 14:15:22.000000000 +0200 +++ stgit-0.3/gitmergeonefile.py 2005-07-03 02:33:13.000000000 +0200 @@ -108,7 +108,7 @@ # 3-way merge else: merge_ok = os.system('diff3 -L local -L older -L remote ' - '-m -E %s %s %s > %s' + '-m -A %s %s %s > %s' % (src1, orig, src2, path)) == 0 if merge_ok: -- Peter Osterlund - petero2@telia.com http://web.telia.com/~u89404340 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Sat Jul 09 18:29:29 2005
This archive was generated by hypermail 2.1.8 : 2005-07-09 18:29:30 EST