Thread (21 messages) flat view 21 messages, 6 authors, 2016-06-15

Re: Recording merges after repo conversion

From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:43:45

Hi,

On Wed, 31 Oct 2007, Peter Karlsson wrote:
quoted
Yes!  Of course!  If what you want becomes possible, I could make an 
evil change in history long gone, and slip it by you. You could not 
even see the history which changed.
I would see the grafts file being changed, which would alert me (the 
problem I have with graft is that it *replaces* history information for 
an element, not just *add* to it, which threw me off at my first attempt 
at creating one).
The thing is: it is too easy to overlook a tiny change like this.  And it 
is very, very difficult to see what it _really_ changed.

Therefore I am _strongly_ opposed to changing the current behaviour.
quoted
You can do that already.  But you have to ask the people at the other 
end to actually apply the graft.
Last time I tried, git would not add files that was in the ".git" 
subdirectory to version control. I might have done something 
incorrectly, though, so I'll see if it works now.
Well, I was not explicit enough.  You can check in the grafts file _under 
a different name_.  Outside of .git/.

Hth,
Dscho
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help