search

northteam / git-repo

Automatically exported from code.google.com/p/git-repo
Apache License 2.0
0 stars 0 forks source link

repo download won't work in "multiple branches for the same project" #173

Open GoogleCodeExporter opened 8 years ago

GoogleCodeExporter commented 8 years ago 
Affected Version: v1.12.16
Environment: All

What steps will reproduce the problem?
1. Map differernt branches for a same project to differnt paths in the 
manifest.xml.
2. Push a commit in one of the branches in gerrit.
3. Try to use the "repo download" from gerrit to apply the patch

What is the expected output? What do you see instead?

The patch should be applied successfully. But the result would be really random 
sinse repo has no idea which path should that patch go.

Please provide any additional information below.

This is a side effect of 

Author: David James <davidjames@google.com>  2013-10-12 08:03:19
Committer: David James <davidjames@google.com>  2013-10-15 06:34:32
Parent: b25ea555c39cd500740acb74fa9f1dab71588266 (Merge "Respect remote
aliases")
Child:  e695338e21080d3cbe20935db572e4cd0c7a620c (Merge "repo: Support multiple 
branches for the same project.")
Branches: default, remotes/m/master, remotes/origin/master, 
remotes/origin/stable
Follows: v1.12.4
Precedes: v1.12.8

     repo: Support multiple branches for the same project.

     It is often useful to be able to include the same project more than
     once, but with different branches and placed in different paths in the
     workspace. Add this feature.

     This CL adds the concept of an object directory. The object directory
     stores objects that can be shared amongst several working trees. For
     newly synced repositories, we set up the git repo now to share its
     objects with an object repo.

     Each worktree for a given repo shares objects, but has an independent
     set of references and branches. This ensures that repo only has to
     update the objects once; however the references for each worktree are
     updated separately. Storing the references separately is needed to
     ensure that commits to a branch on one worktree will not change the
     HEAD commits of the others.

     One nice side effect of sharing objects between different worktrees is
     that you can easily cherry-pick changes between the two worktrees
     without needing to fetch them.

     Bug: Issue 141
     Change-Id: I5e2f4e1a7abb56f9d3f310fa6fd0c17019330ecd

Original issue reported on code.google.com by ChenMul...@gmail.com on 11 Jul 2014 at 6:57

GoogleCodeExporter commented 8 years ago 
Hi,

Kindly share the manifest.xml that you used. And also please provide some more 
details of what error message you receive while executing the repo download. 
This would help to reproduce the problem for debugging.

Regards, Sushan.

Original comment by ray.sus...@gmail.com on 22 Jul 2014 at 1:20

GoogleCodeExporter commented 8 years ago 
https://gerrit-review.googlesource.com/#/c/59817/1

Original comment by mani.cha...@tcs.com on 8 Sep 2014 at 7:50