Bug 30757

Summary:	ability to specify a merge strategy for dependencies
Product:	Sisyphus	Reporter:	Ivan Zakharyaschev <imz>
Component:	topgit	Assignee:	Ivan Zakharyaschev <imz>
Status:	NEW ---	QA Contact:	qa-sisyphus
Severity:	enhancement
Priority:	P3	CC:	imz, ivanov.maxim
Version:	unstable
Hardware:	all
OS:	Linux
URL:	https://github.com/greenrd/topgit/issues/42

Description

Ivan Zakharyaschev 2015-02-18 17:00:23 MSK

topgit-0.9-alt3.git20130407

I have a workflow where I must "git merge -s ours topic1 topic2 ..." into `master` ([before releasing a package in ALTLinux](http://www.altlinux.org/%D0%A0%D1%83%D0%BA%D0%BE%D0%B2%D0%BE%D0%B4%D1%81%D1%82%D0%B2%D0%BE_%D0%BF%D0%BE_gear#.D0.A0.D0.B5.D0.BF.D0.BE.D0.B7.D0.B8.D1.82.D0.BE.D1.80.D0.B8.D0.B9_.D1.81_.D0.BE.D1.82.D0.B4.D0.B5.D0.BB.D1.8C.D0.BD.D1.8B.D0.BC.D0.B8_.D0.B2.D0.B5.D1.82.D0.BA.D0.B0.D0.BC.D0.B8_.D0.B4.D0.BB.D1.8F_upstream_.D0.B8_.D0.BF.D0.B0.D1.82.D1.87.D0.B5.D0.B9) which includes `topic1`, `topic2`, etc. as patches in the package. (Then the commit is tagged as the release, so that the patches can always be generated if you have Git history up to the tagged commit.)

I'd like to automate this workflow with TopGit, so that `tg update` would know that these dependencies should be merged with `-s ours`.

`tg create` should be able to save this additional information about the desired merge strategy in `.topdeps`, and `tg update` should follow this specification.

Reported upstream as https://github.com/greenrd/topgit/issues/42 .