public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Kirill Marchuk <62mkv@mail•ru>
To: git@vger•kernel.org
Subject: Re: very weird behaviour with
Date: Fri, 27 Mar 2015 10:58:18 +0000 (UTC)	[thread overview]
Message-ID: <loom.20150327T115302-412@post.gmane.org> (raw)
In-Reply-To: loom.20150326T115519-901@post.gmane.org

Kirill Marchuk <62mkv <at> mail.ru> writes:

> 
> Kirill Marchuk <62mkv <at> mail.ru> writes:
> 
> > 
> > Hi everyone
> > 
> >   I'm totally stuck with a following problem:
> (censor cut)
> ...........
> > 
> > But I believe that it might be due to my total misunderstanding of something
> > 
> > Anyway, I totally appreciate your help !
> > 
> > Thanks a lot
> > 
> > Kirill, frustrated unexperienced git user...
> > 
> > 
> 
> Hi Again
> 
> With "git subtree" today I have had even worse experience: 
> 
> 1) git checkout test
> 2) git branch test-tmp
> 3) mv adminUI adminUI2 (because otherwise errors..)
> 4) git commit -a -m "Renamed adminUI" 
> 5) git subtree add --prefix=adminUI adminui-origin/test --squash
> 6) mv adminUI adminUI2 (because I don't want here the "deploy" versions)
> 7) git commit -a -m "Added adminui as subtree"
> 8) git merge develop (!!!!!! it went smoothly, but... see below)
> 9) git checkout adminui-test
> 10) git subtree merge --prefix=adminUI test-tmp
> 11) git push adminui-origin test-adminui:test
> (instead of 9-11 I've tried to use "git subtree push", it's basically the
> same, I believe, only takes FAR more time to complete)
> 
> I was very glad and happy. Unless I've realized that, in fact, step 7 did
> not proceed as it was intended to (by me, at least)
> 
> It has 2 parents, and 2 diffs, and one of them shows exactly what it has to
> show (i.e. diff between tips of "develop" and "test-tmp"), but the files on
> the commit snapshot were left unchanged (I cannot imagine how could that
> happen, but that did)
> 
> If I modify files and commit them RIGHT INTO test-tmp branch, all the rest
> goes fine (so far), but that unability to merge from "develop" is something
> that's killing the whole point of it :(( 
> 
> I believe I am not the only one on this mailing list, so pleeease... 
> 
> Kirill
> 
> 


Even more mysterious thing happens today...
when I do 
git checkout test-adminui
git subtree merge --prefix=adminUI test-tmp

I receive 
'adminUI' does not exist; use 'git subtree add'

all the difference I can possibly think of, is that it probably requires me
to create "subtree" after every push ?? 
or is it due to my checkout-s and pulls into other branches during the day ? 

No ideas

Any help is greatly appreciated.. Although I am starting to think that I
probably chose wrong channel to seek for help on this case... 

Thanks for any reaction.

Kirill

     prev parent reply	other threads:[~2015-03-27 10:58 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-25 12:55 very weird behaviour with "merge -s subtree" Kirill Marchuk
2015-03-26 11:08 ` very weird behaviour with Kirill Marchuk
2015-03-27 10:58   ` Kirill Marchuk [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=loom.20150327T115302-412@post.gmane.org \
    --to=62mkv@mail$(echo .)ru \
    --cc=git@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox