5.4 Examining Your Changes
Generally speaking, the reason to form your own branches is to to development: you commit your changes to your branches; others (usually upstream) can merge those changes from your branches.
Hypothetical Local Changes, For Illustration Purposes
Begin with a tree containing a revision of your branch:
% tla get lord@gnu.org--my-hacks-2005/TOP--tla--1.3.1 tla-tree % cd tla-tree % tla buildcfg ./config % cd src/tla % tla tree-version lord@emf.net--my-hacks-2005/TOP--tla--1.3.1
In that directory, make your changes to the tla
project.
As an example, let's suppose that you make two changes. First,
you modify the file COPYING
so that instead of beginning:
from Copying
:
All or most of the source files in this distribution refer to this file for copyright and warranty information. This file should be included whenever those files are redistributed.
it begins:
from (modified) Copying
:
All or most of the source files in the tree rooted here refer to this file for copyright and warranty information. This file should be included whenever those files are redistributed.
You might also add a comment to Makefile.in
so that instead of:
from Makefile.in
:
include $(makefiles)/dirs.mk
it reads
from Makefile.in
:
# use the default rules for recursively building # a set of subdirectories, in the appropriate order: # include $(makefiles)/dirs.mk
Examining Changes
The command
% tla changes
reports the list of modified files.
With an option:
% tla changes --diffs
reports both the list of modified files and diffs
of how those
files have changed.
Commands Discussed
% tla changes -H
Copyright
Copyright (C) 2005 Tom Lord (lord@emf.net
)
This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version.
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this software; see the file COPYING
. If not, write to the Free Software Foundation, 675
Mass Ave, Cambridge, MA 02139, USA.