kicad-developers team mailing list archive

[Garth Corral <gcorral@xxxxxxxxx>]

Yes.  Thanks, Nick.  Sorry, I should have been more clear.

I only noticed this, though, when I merged trunk into my branch and got a bunch of diffs that didn’t seem right.  There were diffs that seemingly wanted to revert changes I’d already taken, and they were all these mystery changes. I’ve not seen this before with bzr and don’t quite understand what’s going on.

Here’s another example:

http://bazaar.launchpad.net/~kicad-product-committers/kicad/product/files/head:/common/view/ <http://bazaar.launchpad.net/~kicad-product-committers/kicad/product/files/head:/common/view/>


Garth


> On Apr 5, 2015, at 1:13 AM, Nick Østergaard <oe.nick@xxxxxxxxx> wrote:
> 
> 2015-04-05 10:11 GMT+02:00 jp charras <jp.charras@xxxxxxxxxx <mailto:jp.charras@xxxxxxxxxx>>:
>> Le 05/04/2015 06:02, Garth Corral a écrit :
>>> 
>>> Is it just me or did this commit clobber a bunch of files it probably
>>> shouldn’t have?
>>> 
>>> Not being super familiar with bazaar I’m not quite sure what I’m
>>> seeing.
>>> 
>>> For example, if you browse the code to
>>> Documents/compiling/mac-osx.txt in launchpad it claims that the
>>> latest rev is 5572, but the change set for 5572 does not show this
>>> file.  Looking at the file, though, it clearly clobbered the contents
>>> of Bernhard’s last commit.  There appear to be many more examples.
>>> 
>>> 
>>> Garth
>> 
>> I do not see any change in mac-osx.txt between 5571 and 5572 (I compared
>> them on my computer, where I still have a 5571 version).
>> The latest change is 5305 (2014-11-28 from Bernhard Stegmaier).
> 
> I think what Garth is refferin to is the launchpad browser. See:
> http://bazaar.launchpad.net/~kicad-product-committers/kicad/product/files/head:/Documentation/compiling/ <http://bazaar.launchpad.net/~kicad-product-committers/kicad/product/files/head:/Documentation/compiling/>
> 
> Notice the Latest Rev and Last Changed coloumns.
> 
> _______________________________________________
> Mailing list: https://launchpad.net/~kicad-developers <https://launchpad.net/~kicad-developers>
> Post to     : kicad-developers@xxxxxxxxxxxxxxxxxxx <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx>
> Unsubscribe : https://launchpad.net/~kicad-developers <https://launchpad.net/~kicad-developers>
> More help   : https://help.launchpad.net/ListHelp <https://help.launchpad.net/ListHelp>

Attachment: smime.p7s
Description: S/MIME cryptographic signature