Re: Submodules with feature branches

2014-06-05 Thread W. Trevor King
On Thu, Jun 05, 2014 at 12:00:33PM -0700, W. Trevor King wrote: > On Thu, Jun 05, 2014 at 01:31:39PM -0500, Robert Dailey wrote: > > Instead of just creating my branch and starting to make commits, I > > now have to setup my submodule branch first. Also pull requests > > won't show the changes to t

Re: Submodules with feature branches

2014-06-05 Thread W. Trevor King
On Thu, Jun 05, 2014 at 01:31:39PM -0500, Robert Dailey wrote: > On Thu, Jun 5, 2014 at 11:23 AM, W. Trevor King wrote: > > 3rd party libraries sound loosely-coupled to me ;). In one of my more > > mature projects I did a similar thing, and just used relative URLs [1] > > and sibling mirrors/forks

Re: Submodules with feature branches

2014-06-05 Thread Robert Dailey
On Thu, Jun 5, 2014 at 11:23 AM, W. Trevor King wrote: > 3rd party libraries sound loosely-coupled to me ;). In one of my more > mature projects I did a similar thing, and just used relative URLs [1] > and sibling mirrors/forks [2,3,4]. > > Cheers, > Trevor > > [1]: https://github.com/wking/pygra

Re: Submodules with feature branches

2014-06-05 Thread W. Trevor King
On Thu, Jun 05, 2014 at 10:57:17AM -0500, Robert Dailey wrote: > I was planning on creating a submodule for our third party libs and > store them extracted in there. 3rd party libraries sound loosely-coupled to me ;). In one of my more mature projects I did a similar thing, and just used relative

Re: Submodules with feature branches

2014-06-05 Thread Robert Dailey
On Thu, Jun 5, 2014 at 10:15 AM, W. Trevor King wrote: > So you have: > > On the trunk host: On your public host: Locally: > superproject superproject superproject > submodulesubmodule `-- submodule > > In that case, a corresponding feature bran

Re: Submodules with feature branches

2014-06-05 Thread W. Trevor King
On Thu, Jun 05, 2014 at 09:03:25AM -0500, Robert Dailey wrote: > When I work on a feature, I normally create a feature branch. If I > happen to make changes to the submodule that only work with the > changes introduced in my feature branch, that seems to complicate > things. For the purposes of the

Submodules with feature branches

2014-06-05 Thread Robert Dailey
I have a question regarding submodules and their applicability given our workflow at the place I work. When I work on a feature, I normally create a feature branch. If I happen to make changes to the submodule that only work with the changes introduced in my feature branch, that seems to complicat