Version control

Uwe Bonnes wrote:

>Randy Yates <yates@ieee.org> wrote:

>> MB: Can you be specific? How is git better than svn? I've considered

>> changing over but haven't seen a convincing argument.

>Consider GIT as an distributed SVN. All data is local, while with SVN much

... and therefore DRCS usually have better merge handling (because it

heavily depends on it).

For the Eagle users this doesn't make much difference, since files are

binary and even with the upcoming text format, I don't expect we can

merge concurrent changes in Eagle brd/sch. Maybe in libraries...

BTW: If someone is interested in DRCS, and can't rule out using

Windows, he should look also at Mercurial as an alternative to Git.

Git developers don't like Windows, and they don't like Windows users.

Oliver

Randy Yates <yates@ieee.org> wrote:

MB: Can you be specific? How is git better than svn? I've considered

changing over but haven't seen a convincing argument.

Consider GIT as an distributed SVN. All data is local, while with SVN much

data is on the server. If for some reason the server is unaccessible, SVN is

hampered much more than GIT.

--

Uwe Bonnes                bon@elektron.ikp.physik.tu-darmstadt.de

Institut fuer Kernphysik  Schlossgartenstrasse 9  64289 Darmstadt

-

Tel. 06151 162516 -

Fax. 06151 164321 -

MB: Can you be specific? How is git better than svn? I've considered changing over but haven't seen a convincing argument.

--Randy

"Jorge Garcia" <jorge@cadsoftusa.com> wrote in message

news:i0dba6$18r$1@cheetah.cadsoft.de...

On 6/28/2010 8:17 PM, David Ingebretsen wrote:

>> I am a one man shop, nonetheless, I find I need to establish some kind of

>> revision control. I'm struggling trying to find the best way in Eagle to

>> keep track of notes, changes, etc.

>> 1. I'd like to have a way to automatically/easily bump the revision of a

>> schematic/PCB. Something like version control in software design.

>> 2. I'd like a straightforward way to track the changes and keep notes and

>> comments. It's a pain to add text one line at a time on the schematic

>> itself and I find the supplied "frames" to be a bit cumbersome to use.

>>

>> I've struck out trying to find anything in the user manual or in the

>> list.

>>

>>

>> I've looked through the download section for ULPs, but didn't find

>> anything.

>>

>> I find I'm already getting lost in revisions.

>>

>> Thanks for any advice.

>

Hi David,

>

Why not simply use a version control program. I've communicated with

several engineers and most of them recommend Subversion. It's open source

(Free) and does a good job. If you like to use a GUI interface then

Tortoise SVN or Rabbit SVN might be a good choice.

>

Hth,

>

Jorge Garcia

I've been using subversion with TortoiseSVN, and it works great.  Right now

I'm running a subversion server and repository on a QNAP network disk, but

for an easy setup I'd recommend an Ubuntu server for subversion.  You can

just use "apt-get install" to install subversion and svn-serve.  Setting up

the repository is straight forward, there are a number of how-to's online

that will give you an easy step-by-step.  Tortoise SVN is a subversion

client which integrates into windows.  Once its installed, you can just

right click on things for all your version control needs.

Sean

On 6/28/2010 8:17 PM, David Ingebretsen wrote:

I am a one man shop, nonetheless, I find I need to establish some kind of

revision control. I'm struggling trying to find the best way in Eagle to

keep track of notes, changes, etc.

1. I'd like to have a way to automatically/easily bump the revision of a

schematic/PCB. Something like version control in software design.

2. I'd like a straightforward way to track the changes and keep notes and

comments. It's a pain to add text one line at a time on the schematic

itself and I find the supplied "frames" to be a bit cumbersome to use.

>

I've struck out trying to find anything in the user manual or in the list.

>

>

I've looked through the download section for ULPs, but didn't find

anything.

>

I find I'm already getting lost in revisions.

>

Thanks for any advice.

After suffering CVS and SVN for many years, I finally followed Linus to

GIT and have seen the light.  GIT does version control like a normal

human would expect.  We've changed hundreds of projects over to it so

far.  GIT does for versioning control software what Linux did for UNIX, IMO.

"Morten Leikvoll" wrote:

>I just had an idea to a simple graphical version diff program that may be

>done in an ULP.

>

>All you could do is to export the layers as bitmaps in the two different

>versions using the "EXPORT IMAGE" ulp command

That's also done quickly without ULP.

>and then make a function that

>highlights the differences, pixel by pixel.

Beyond Compare from Scooter Software does bitmap compare.

Of course, it compares also netlists very well.

Oliver

I just had an idea to a simple graphical version diff program that may be

done in an ULP.

All you could do is to export the layers as bitmaps in the two different

versions using the "EXPORT IMAGE" ulp command and then make a function that

highlights the differences, pixel by pixel.

I think this could be a very useful tool if done right. Unfortunately I dont

have much time to play with it. Maybe someone else have?

Here is a suggested draft:

-The ULP runs a command batch file with the SYSTEM ulp command. The batch

does:

    *If needed the ULP can present different versions to compare with (via

cvs,svn or whatever)

    *load the project you want to compare with to a temp folder (via cvs,svn

or whatever..)

    *executes the command line of eagle, loading the project and executes an

ULP that exports the images

     of the layers you want to compare.

-The export is run on currently opened project.

-Bitmap comparision is performed either internally (slow) or externally

(faster), presenting for example new stuff in green and old stuff in red

-The diff bitmap result may be imported (and scaled) to "diff" layer[s].

Lorenz wrote:

Robert Pearce wrote:

>> Lorenz wrote:

>>> sadly keyword expansion doesn't work. It messes with eagles licence

>>> mechanism.

>>>

>> Oh, that's a pity. Is that a hang-over from the file-corrupting evil

>> licence scheme of pre-V4 Eagle?

 

yes 8-(

 

 

>>> And I'm still looking for a usable diffing tool for eagle schematic

>>> and board files 8-)

>> Now that would be nice! But it's on my wish-list for every graphical

>> tool I've ever used.

 

I have a very clumsy workaround though:

 

export all schematic pages / board layers as bitmaps and compare the

versions with a grafical diff tools like TortoiseIDiff (borrowed from

TortoiseSVN).

You can also generate gerbers for each verstion,  read both into a gerb

viewer,  turn off all but two layers (corresponding layers in the two

version),  and then see the changes.   Since most viewers will xor the

colors of the two layers you will see changes in pretty high contrast.

  I don't know if a similar method for schematics however.

Jim

Robert Pearce wrote:

Lorenz wrote:

>>sadly keyword expansion doesn't work. It messes with eagles licence

>>mechanism.

>>

>Oh, that's a pity. Is that a hang-over from the file-corrupting evil

>licence scheme of pre-V4 Eagle?

yes 8-(

>>And I'm still looking for a usable diffing tool for eagle schematic

>>and board files 8-)

>

>Now that would be nice! But it's on my wish-list for every graphical

>tool I've ever used.

I have a very clumsy workaround though:

export all schematic pages / board layers as bitmaps and compare the

versions with a grafical diff tools like TortoiseIDiff (borrowed from

TortoiseSVN).

--

Lorenz

On Thu, 1 Jul 2010, Lorenz wrote to us saying :

>

>sadly keyword expansion doesn't work. It messes with eagles licence

>mechanism.

>

Oh, that's a pity. Is that a hang-over from the file-corrupting evil

licence scheme of pre-V4 Eagle?

>And I'm still looking for a usable diffing tool for eagle schematic

>and board files 8-)

Now that would be nice! But it's on my wish-list for every graphical

tool I've ever used.

--

Rob Pearce                       http://www.bdt-home.demon.co.uk

The contents of this | Windows NT crashed.

message are purely   | I am the Blue Screen of Death.

my opinion. Don't    | No one hears your screams.

believe a word.      |