Re: [git-users] I don't know how to from rej file to adjust the source
Hi Konstantin,
It's a .ref file, I don't know where the conflict comes from, and how to
adjust the file to remove this conflict, in other words. I don't understand
the rej file mean to me
Lei
On Fri, May 16, 2014 at 6:07 PM, Konstantin Khomoutov
flatw...@users.sourceforge.net wrote:
On Fri, 16 May 2014 17:21:10 +0800
lei yang yanglei.f...@gmail.com wrote:
#cat recipes-devtools/python/python-heat_git.bb.rej
diff
a/meta-openstack/recipes-devtools/python/python-heat_git.bbb/meta-openstack/recipes-devtools/python/
python-heat_git.bb(rejected hunks) @@ -10,6 +10,9 @@ SRCNAME =
heat SRC_URI =
git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \
file://heat.conf \ file://heat.init \
+ file://autoscaling_example.template \
+ file://one_vm_example.template \
+ file://two_vms_example.template \
SRCREV=ff6901141fbbc0a13604491aaba01a60487d6f6d
It's just a patch file in the so-called unified diff format [1].
To apply it, use the `patch` program.
If you need to apply it to the work tree of a Git repository,
use `git apply` (`git am` might also work).
1. http://en.wikipedia.org/wiki/Diff#Unified_format
--
You received this message because you are subscribed to the Google Groups Git
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
Re: [git-users] Re: git rewrite history for multi module project
Unbelievable. Its working! Many thanks Thomas, you have been a great help It is even working with a complexer directory structure. I think with one try it didn't detect the correct parents, but if I choose one of the parent commits to be the last commit in the old repo, where all contents have been deleted, it will still be detected during the fake merge. Maybe the only down side of this approach is that you have to specify git log --follow instead of just git log. but never the less great solution. For anyone in the future reading this and want to know which commits to use as parents and child in the graft point. I searched for the first commit in the new repository where hundreds of files have been added and considered this as parent1. Its child commit in the new repository is the child in the graft point. Finally I chose the commit in the old repository where the same hundreds of files have been removed. If no such commit exists (I also have this case), then choose the last commit in the old repo Maybe an even better approach would be to create a brand new merge commit to contain the files remove and add, and to replace the first commit in the new repository with this one. Cheers -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
[git-users] Re: Bare repository
On Friday, May 16, 2014 11:03:26 PM UTC+2, Alain wrote: This is what i understood from the book i'm reading, but what i don't catch (because nothing about it is written) it's about the bare repository and source repository permissions. I'm going to assume source repository means non-bare repository, or a repository with a work-tree. i understood that bare repository is in fact the content of the .git directory contained inside the source repository. Yeah, pretty much. what i miss it's if you share both to team members ? i mean if you share (write/read access) to bare repository and source repository. No, you don't give others access to your work-tree repository. It's on your own computer, and you don't share it. You do your work there, make commits, and push from it. And fetch/pull to it. team members clone the bare repository, pull, do changes, commit and push... but i simulate the situation in the book, where bob change a file and list change the same file. Now Bob push changed filed and Lisa pull, applied updated (add Bob's changes + her) and try to push. however as both are on local copy of the repository they can't push it to origin/master (to the source repository) I'm not sure which book or what page this is, but I'm going to assume Bob and Lisa share a central bare repository on some server. First Bob pushes his change first to the server. Afterwards Lisa does a pull, and gets Bob's changes into her local work-tree repository, and she applies her own changes, and then pushes to the central repository again. This is quite normal procedure with Git. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
