Re: [Kicad-developers] Fatfingering with bzr...

2012-04-07 Thread lajos kamocsay
Hi Dick- Thanks for the email. Distributed revision control saved me many times, I'm really glad the kicad project is using it. I looked at the doc repository and read this thread, but couldn't really figure out which revision he wanted to go back to. But all the old revisions are there, so it's

Re: [Kicad-developers] Fatfingering with bzr...

2012-04-06 Thread Dick Hollenbeck
lajos, Some time ago Vesa volunteered to be our librarian and now seems ready to contribute to this important and difficult cause. Your proficient help and guidance with BZR is appreciated. Anything we can do to help Vesa, our librarian, is important. Thanks, Dick > Vesa- > > When you pus

Re: [Kicad-developers] Fatfingering with bzr...

2012-04-06 Thread lajos kamocsay
Vesa- When you push your changes to the server, it just appends your new revisions to what the server already has. It does not delete any old revisions. When you had a divergence issue, it was simply because the server had a newer revision than the revision you started your changes on. That's why

Re: [Kicad-developers] Fatfingering with bzr...

2012-04-06 Thread Dick Hollenbeck
On 04/06/2012 02:19 PM, Solonen Vesa wrote: > Cleaning the mess is in the works, but there are quite amusing things on the > status log... It seems some of the revision info got lost and I don't know > how to get it back. > > bzr merge -r 323..322 seems to do what it says, but I'm a bit reluctant

Re: [Kicad-developers] Fatfingering with bzr...

2012-04-06 Thread Solonen Vesa
Cleaning the mess is in the works, but there are quite amusing things on the status log... It seems some of the revision info got lost and I don't know how to get it back. bzr merge -r 323..322 seems to do what it says, but I'm a bit reluctant to use it on the repo as it will delete stuff I did

Re: [Kicad-developers] Fatfingering with bzr...

2012-04-05 Thread Dick Hollenbeck
On 04/05/2012 05:02 PM, Miguel Angel wrote: > Bzr push is not like git push? > > http://doc.bazaar.canonical.com/latest/en/mini-tutorial/ > > I think it just sends the last commits with your changes, right? > > Greetings from the mountains on Avila (near Madrid) I took the laptop with me > so it

Re: [Kicad-developers] Fatfingering with bzr...

2012-04-05 Thread Miguel Angel
Sorry, I'm quite new to bzr, and I'm getting quite lost here. If you don't use push, ..what's the normal way of sending your changes when you've access to the main branch? Enviado desde un móvil El 04/04/2012, a las 07:16, Dick Hollenbeck escribió: > On 04/03/2012 05:56 PM, Solonen Vesa wro

Re: [Kicad-developers] Fatfingering with bzr...

2012-04-05 Thread Miguel Angel
Bzr push is not like git push? http://doc.bazaar.canonical.com/latest/en/mini-tutorial/ I think it just sends the last commits with your changes, right? Greetings from the mountains on Avila (near Madrid) I took the laptop with me so it seems I will have some more time to work on the scripting

Re: [Kicad-developers] Fatfingering with bzr...

2012-04-05 Thread Dick Hollenbeck
On 04/04/2012 08:47 AM, Solonen Vesa wrote: >> push >> is generally never to be used on a branch which is writable by more than one >> user. > Makes sense. Is it possible to blacklist certain bzr commands in repository > setup (server side)? Would be good to reserve push for a maintainer only. >

Re: [Kicad-developers] Fatfingering with bzr...

2012-04-04 Thread Solonen Vesa
> push > is generally never to be used on a branch which is writable by more than one > user. Makes sense. Is it possible to blacklist certain bzr commands in repository setup (server side)? Would be good to reserve push for a maintainer only. -Vesa

Re: [Kicad-developers] Fatfingering with bzr...

2012-04-03 Thread Dick Hollenbeck
On 04/03/2012 05:56 PM, Solonen Vesa wrote: > It seems that the doc tree got a bit messed up after some divergence > problems. I would most sincerely like to fix the branch to the same it was > before the last push... I committed my changes to the local branch before > syncing and got the diverg

[Kicad-developers] Fatfingering with bzr...

2012-04-03 Thread Solonen Vesa
It seems that the doc tree got a bit messed up after some divergence problems. I would most sincerely like to fix the branch to the same it was before the last push... I committed my changes to the local branch before syncing and got the divergence error on push. Sorted out the divergence by mer