![](https://seccdn.libravatar.org/avatar/fff0f38e92656c8a636916213eb952c4.jpg?s=120&d=mm&r=g)
Hi, On Mon, 20 Apr 2009, Michael Schroeder wrote:
Adrian talks about (a), but Andreas is mostly concerned about (b). He wants to make very sure that working with the packages is easy and reliable. In particular, once the builders have found out that a diff doesn't apply anymore, how the developer is supposed to fix this breakage in the most easy way. A reliable three-way merge is the best option here. And for this remembering the common base version is absolutely required, there's no way around that.
Don't tell me that you double check every 'svn up' or 'git pull' when the system does a merge and there is no conflict.
Nope, I do not. I don't do this because I know it uses three way merges, which means there's a low probability for errors when no conflicts are advised.
Btw. I wholeheartedly agree with everything he says, currently the source link concept is broken in a very peculiar way.
No, it's not. You're overlooking that "keeplink" mode is just a tiny fraction of the source link functionality.
I'm not overlooking it, that's why I said "peculiar", not "totally". Ciao, Michael. -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-packaging+help@opensuse.org