Re: git merge banch w/ different submodule revision

2018-05-07 Thread Middelschulte, Leif
Hi, Am Freitag, den 04.05.2018, 07:43 -0700 schrieb Elijah Newren: > On Fri, May 4, 2018 at 3:18 AM, Heiko Voigt wrote: > > Hi, > > > > On Fri, May 04, 2018 at 08:29:32AM +, Middelschulte, Leif wrote: > > > Am Donnerstag, den 03.05.2018, 18:42 +0200 schrieb Heiko Voigt: > > > > > > It seem

Re: git merge banch w/ different submodule revision

2018-05-04 Thread Elijah Newren
On Fri, May 4, 2018 at 3:18 AM, Heiko Voigt wrote: > Hi, > > On Fri, May 04, 2018 at 08:29:32AM +, Middelschulte, Leif wrote: >> Am Donnerstag, den 03.05.2018, 18:42 +0200 schrieb Heiko Voigt: >> > It seems to me that you do not want to mix integration testing and >> > testing of the feature

Re: git merge banch w/ different submodule revision

2018-05-04 Thread Heiko Voigt
Hi, On Fri, May 04, 2018 at 08:29:32AM +, Middelschulte, Leif wrote: > Am Donnerstag, den 03.05.2018, 18:42 +0200 schrieb Heiko Voigt: > > I still do not understand how the current behaviour is mismatching with > > users expectations. Let's assume that you directly tracked the files of > > L i

Re: git merge banch w/ different submodule revision

2018-05-04 Thread Middelschulte, Leif
Hi, Am Donnerstag, den 03.05.2018, 18:42 +0200 schrieb Heiko Voigt: > Hi, > > On Wed, May 02, 2018 at 07:30:25AM +, Middelschulte, Leif wrote: > > Am Montag, den 30.04.2018, 19:02 +0200 schrieb Heiko Voigt: > > > On Thu, Apr 26, 2018 at 03:19:36PM -0700, Stefan Beller wrote: > > > > Stefan wro

Re: git merge banch w/ different submodule revision

2018-05-03 Thread Heiko Voigt
Hi, On Wed, May 02, 2018 at 07:30:25AM +, Middelschulte, Leif wrote: > Am Montag, den 30.04.2018, 19:02 +0200 schrieb Heiko Voigt: > > On Thu, Apr 26, 2018 at 03:19:36PM -0700, Stefan Beller wrote: > > > Stefan wrote: > > > > See > > > > https://github.com/git/git/commit/68d03e4a6e448aa557f52

Re: git merge banch w/ different submodule revision

2018-05-02 Thread Middelschulte, Leif
Am Montag, den 30.04.2018, 19:02 +0200 schrieb Heiko Voigt: > On Thu, Apr 26, 2018 at 03:19:36PM -0700, Stefan Beller wrote: > > Stefan wrote: > > > See > > > https://github.com/git/git/commit/68d03e4a6e448aa557f52adef92595ac4d6cd4bd > > > (68d03e4a6e (Implement automatic fast-forward merge for su

Re: git merge banch w/ different submodule revision

2018-04-30 Thread Heiko Voigt
On Thu, Apr 26, 2018 at 03:19:36PM -0700, Stefan Beller wrote: > Stefan wrote: > > See > > https://github.com/git/git/commit/68d03e4a6e448aa557f52adef92595ac4d6cd4bd > > (68d03e4a6e (Implement automatic fast-forward merge for submodules, > > 2010-07-07) > > to explain the situation you encounter.

Re: git merge banch w/ different submodule revision

2018-04-28 Thread Jacob Keller
On Fri, Apr 27, 2018 at 5:24 PM, Elijah Newren wrote: > I would expect that a different example involving non-linear history > would behave the same, if both sides update the submodule in a fashion > that is just fast-forwarding and one commit contains the other in its > history. I'm curious if y

Re: git merge banch w/ different submodule revision

2018-04-27 Thread Elijah Newren
Hi, On Fri, Apr 27, 2018 at 3:37 AM, Middelschulte, Leif wrote: > Am Donnerstag, den 26.04.2018, 17:19 -0700 schrieb Elijah Newren: >> On Thu, Apr 26, 2018 at 3:49 AM, Middelschulte, Leif >> wrote: >> > Problem case: Merge either branch into the other >> > >> > Expected behavior: Merge conflict

Re: git merge banch w/ different submodule revision

2018-04-27 Thread Middelschulte, Leif
Hi, firstofall: thank all of you for your feedback. Am Donnerstag, den 26.04.2018, 17:19 -0700 schrieb Elijah Newren: > On Thu, Apr 26, 2018 at 3:49 AM, Middelschulte, Leif > wrote: > > Hi, > > > > we're using git-flow as a basic development workflow. However, doing so > > revealed unexpected

Re: git merge banch w/ different submodule revision

2018-04-26 Thread Elijah Newren
On Thu, Apr 26, 2018 at 3:49 AM, Middelschulte, Leif wrote: > Hi, > > we're using git-flow as a basic development workflow. However, doing so > revealed unexpected merge-behavior by git. > > Assume the following setup: > > - Repository `S` is sourced by repository `p` as submodule `s` > - Reposit

Re: git merge banch w/ different submodule revision

2018-04-26 Thread Elijah Newren
On Thu, Apr 26, 2018 at 2:46 PM, Jacob Keller wrote: > On Thu, Apr 26, 2018 at 10:56 AM, Stefan Beller wrote: >> We often treating a submodule as a file from the superproject, but not >> always. >> And in case of a merge, git seems to be a bit smarter than treating it >> as a textfile >> with tw

Re: git merge banch w/ different submodule revision

2018-04-26 Thread Stefan Beller
Stefan wrote: > See https://github.com/git/git/commit/68d03e4a6e448aa557f52adef92595ac4d6cd4bd > (68d03e4a6e (Implement automatic fast-forward merge for submodules, > 2010-07-07) > to explain the situation you encounter. (specifically merge_submodule > at the end of the diff) +cc Heiko, author of

Re: git merge banch w/ different submodule revision

2018-04-26 Thread Jacob Keller
On Thu, Apr 26, 2018 at 10:56 AM, Stefan Beller wrote: > We often treating a submodule as a file from the superproject, but not always. > And in case of a merge, git seems to be a bit smarter than treating it > as a textfile > with two different lines. Sure, but a submodule is checked out "at a c

Re: git merge banch w/ different submodule revision

2018-04-26 Thread Stefan Beller
On Thu, Apr 26, 2018 at 3:49 AM, Middelschulte, Leif wrote: > Hi, > > we're using git-flow as a basic development workflow. However, doing so > revealed unexpected merge-behavior by git. > > Assume the following setup: > > - Repository `S` is sourced by repository `p` as submodule `s` > - Reposit

git merge banch w/ different submodule revision

2018-04-26 Thread Middelschulte, Leif
Hi, we're using git-flow as a basic development workflow. However, doing so revealed unexpected merge-behavior by git. Assume the following setup: - Repository `S` is sourced by repository `p` as submodule `s` - Repository `p` has two branches: `feature_x` and `develop` - The revisions sourced