Last few years, I was working inside some projects (Umit and others).
When you work with other peoples commits are limited so the best idea is create a branch. But how I do that? From last few years I was thinking that svn doesn't have support branches, and the way to do that it's just copy the trunk and make "svn merge .." and keep update the branch.
Last month a guy named Guilherme, show me how I really make a branch inside Subversion.
It's not easy if you're working with old tracking. It's the reason of the post.
I would like to talk about:
- branches
- tags
There was a application 'svnmerge' available to create branches. So it keep branch tracking changes on trunk. That's really cool. Advantages?
How svnmerge works with old versions?
First you need to initialize the branches: svnmerge init PATH ( You should do it first at branch, later at trunk)
You can rollback some merges, sample: svnmerge rollback -M r100-120.
The team will take the real avantages after integration, or if you create svnmerge at begin.
In your branch, you can merge easy way: svnmerge merge, and optionally we can specify the revision interval, between revision x and revision y, -rx-y.
At trunk you should do same thing, to push branch changes:
svnmerge merge -S brach_directory
Easy? :D
Thanks Guilherme, it's really cool.
sábado, 24 de janeiro de 2009
domingo, 21 de setembro de 2008
Archlinux - oh can't install
Hi folks,
I was a guy of archlinux some years ago. :)
But it had severals bugs when I was trying use.
Today I was trying install ArchLinux. But oh. I coudn't.
Error no /src/core/pkg is missing and if I try by FTP errors return on select packages.
How solve?
[1] - http://bbs.archlinux.org/viewtopic.php?id=52584
Cheers!
I was a guy of archlinux some years ago. :)
But it had severals bugs when I was trying use.
Today I was trying install ArchLinux. But oh. I coudn't.
Error no /src/core/pkg is missing and if I try by FTP errors return on select packages.
How solve?
Solution: Remove /tmp/.pkgcategory [1]
[1] - http://bbs.archlinux.org/viewtopic.php?id=52584
Cheers!
quinta-feira, 7 de agosto de 2008
ssh server without auth (no auth server/client)
Well I have a Mac OS and Ubuntu.
My ubuntu have sshd - server.
I didn't want no autentification on ssh server.
Introdution and overview about keygen
if you want no auth in ssh server, you need access on your ssh server to change some configs.
If it is a public server (like hosting servers ) configs on server should be done.
Only need to upload your key.
How to say to ssh server that it's my machine trying login?
Client generate a private and public key. You share public key with server.
private and public key matches by algorithm and it's authentication.
So server recognize the keys and doesn't ask password.
How to do that?
Server
Edit /etc/ssh/sshd_config
Change some configs to:
Reload server:
Client
Gerate key:
do same on server if you wish.
AutentificationTroubles?
Put this at server:
Doesn't it works?
cat /var/log/auth.log and grep it!
References:
Troubles page ssh
My ubuntu have sshd - server.
I didn't want no autentification on ssh server.
Introdution and overview about keygen
if you want no auth in ssh server, you need access on your ssh server to change some configs.
If it is a public server (like hosting servers ) configs on server should be done.
Only need to upload your key.
How to say to ssh server that it's my machine trying login?
Client generate a private and public key. You share public key with server.
private and public key matches by algorithm and it's authentication.
So server recognize the keys and doesn't ask password.
How to do that?
Server
Edit /etc/ssh/sshd_config
Change some configs to:
RSAAuthentication yes
PubkeyAuthentication yes
ChallengeResponseAuthentication no
PasswordAuthentication no
UsePAM no
Reload server:
sudo /etc/init.d/ssh reload
Client
Gerate key:
ssh-keygen -q -f id_rsa -t rsa
scp ~/.ssh/id_rsa.pub user@server:~/.ssh/id_rsa.pub
ssh user@server
cd .ssh
cat id_rsa.pub>>authorized_keys
rm id_rsa.pub
exit
do same on server if you wish.
AutentificationTroubles?
Put this at server:
server$ chmod go-w ~/
server$ chmod 700 ~/.ssh
server$ chmod 600 ~/.ssh/authorized_keys
Doesn't it works?
cat /var/log/auth.log and grep it!
References:
Troubles page ssh
terça-feira, 5 de agosto de 2008
Umit 0.9.5 released and Mapper and Network Inventory, Interface Editor and others comming...
Now umits will integrate soc projects! :D
What is comming?
- Mapper
- Network Inventory
- Interface Editor
- Target widget
- NSE Script Editor
soon!! Stay tunned on trunk.
Official message from Umit:
What is comming?
- Mapper
- Network Inventory
- Interface Editor
- Target widget
- NSE Script Editor
soon!! Stay tunned on trunk.
Official message from Umit:
Hi everyone!
We're happy to say we finally have a stable release. We fixed bugs, language files and complemented documentation.
Try it and let us know if you have any trouble. You can send a message to this mailing list or, if you find a bug, please report on our trac[1].
Changes since RC2:
* Changes on tarball, now it does not have *.mo (binary) files
* Fixed icons directory, it was causing problems on uninstall_umit
* Fixed CrashReport message - now have formatted view on trac
* Added number version in components of Umit (umitGUI, umitCore, higwidgets) - it is useful to view if umit is using old stuff in CrashReports.
* Remove some lines that was debuging and it was freezing Umit in some situations (Search Scans and CrashReport)
* Update keyboard shortcuts for Profiles Deletion (it was in conflict with another shortcuts)
* Update language files
* Complement documentation
You can download Umit from here:
http://sourceforge.net/project/showfiles.php?group_id=142490&package_id=156443&release_id=617967
http://www.umitproject.org/?active=download
Now we are ready to start integration of the projects of GSoC and make several improvements on Umit.
Stay tunned!
Cheers!
[1] http://trac.umitproject.org
--
Luís Silva and Rodolfo Carvalho
quinta-feira, 24 de julho de 2008
umit on macports?
First install macports and X11:
Links here:
X11:
http://xquartz.macosforge.org/trac/wiki
or older:
http://developer.apple.com/opensource/tools/X11.html
Macports:
http://www.macports.org/
Just make umit and it runs.
or sudo umit. :)
just easy right now
Macports umit source portfile:
http://trac.macports.org/browser/trunk/dports/net/umit
Bugs report to me
Links here:
X11:
http://xquartz.macosforge.org/trac/wiki
or older:
http://developer.apple.com/opensource/tools/X11.html
Macports:
http://www.macports.org/
sudo port selfupdate
sudo port install umit
Just make umit and it runs.
or sudo umit. :)
just easy right now
Macports umit source portfile:
http://trac.macports.org/browser/trunk/dports/net/umit
Bugs report to me
mercurial && svn -- is it usefull?
Hi all.
Yesterday I was talking with Bartosz ( a friend from Poland) and we're discussing about svn and mercurial. I never had used mercurial before.
Before begin technical skills to do that I need to explain situation.
If you're developer of a application that use svn and you have two computers, and you want to sync code but you can't commit it online. So mercurial it's a nice shot. I'm shipping with it.
In my example I have a desktop and a laptop (macbook) and I development lot of time in Desktop but some times I like to continue coding without commit and without copy the files by other system.
So how I can do that?
Syncing folder between a Mac and a Linux computer
What do you need?
- mercurial
- ssh server
It's easy.
In Desktop computer:
Nice in desktop.
Let's to laptop:
it's done
Now you only to do on server:
on the other computer, clients:
Thanks Bart!
Yesterday I was talking with Bartosz ( a friend from Poland) and we're discussing about svn and mercurial. I never had used mercurial before.
Before begin technical skills to do that I need to explain situation.
If you're developer of a application that use svn and you have two computers, and you want to sync code but you can't commit it online. So mercurial it's a nice shot. I'm shipping with it.
In my example I have a desktop and a laptop (macbook) and I development lot of time in Desktop but some times I like to continue coding without commit and without copy the files by other system.
So how I can do that?
Syncing folder between a Mac and a Linux computer
What do you need?
- mercurial
- ssh server
It's easy.
In Desktop computer:
$ cd root_svn_directory
$ hg init
you need to write a similar file here:
bastiao@bastiao-desktop:~/root_svn_directory$ cat .hg/hgrc
[ui]
username = Your name - desktop
bastiao@bastiao-desktop:~/root_svn_directory$
And you need to wrote .hgignore. The sample it's for python. It's extension to ignore. In my case I want to ignore .svn and pyc (byte compile) files.
bastiao@bastiao-desktop:~/root_svn_directory$ cat .hgignore
syntax: glob
*~
*.pyc
*.svn
bastiao@bastiao-desktop:~/root_svn_directory$
Nice in desktop.
Let's to laptop:
hg clone ssh://user@ip_or_host/root_svn_directory
add contents in .hg/hgrc similar of the desktop file
it's done
Now you only to do on server:
hg update
hg commit -m "message"
on the other computer, clients:
commit:
hg commit -m "message"
sync server: (push to server)
hg push
to update:
hg pull
hg update
Thanks Bart!
sexta-feira, 29 de fevereiro de 2008
Umit running on Mac OS with X11 (draft)
Hi,
Well recently I became a mac user. I bought a macbook (intel).
And I want run Umit on my laptop. So what's can u do to run it??
Steps:
- Install Xcode
- Install macports
- Install py25-gtk ( I suppose that all dependencies should be installed )
sudo port
install py25-gtk
install py25-sqlite3
(may be lack some dependences yet, i'll confirm it)
if u have Bus Error:
disable sqlite : deactive (...)
http://trac.macosforge.org/projects/macports/ticket/12543
Umit is running now
www.umitproject.org
If u have troubles send me a email.
Well recently I became a mac user. I bought a macbook (intel).
And I want run Umit on my laptop. So what's can u do to run it??
Steps:
- Install Xcode
- Install macports
- Install py25-gtk ( I suppose that all dependencies should be installed )
sudo port
install py25-gtk
install py25-sqlite3
(may be lack some dependences yet, i'll confirm it)
if u have Bus Error:
disable sqlite : deactive (...)
http://trac.macosforge.org/projects/macports/ticket/12543
svn co http://svn.umitproject.org/svnroot/umit/trunk umit
cd umit
go to install_scripts/macos/dependences/
and install py2app
go to umit dir and run:
python2.5 umit
Umit is running now
www.umitproject.org
If u have troubles send me a email.
Subscrever:
Mensagens (Atom)